Adwaita: make selection visible in treeview derived widgets

See https://bugzilla.gnome.org/show_bug.cgi?id=757503

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index d6732856ea8f20b72f0fdee867dcc7bed1e7f2c2..16929e5642cd42d23a9a613071bebd983a59c009 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -88,7 +88,6 @@ $asset_suffix: if($variant=='dark', '-dark', '');
   }
 }
 
-textview text,
 .view {
   color: $text_color;
   background-color: $base_color;
@@ -98,19 +97,6 @@ textview text,
     background-color: $backdrop_base_color;
   }
 
-  selection,
-  selection:focus { @extend %selected_items; }
-}
-
-iconview {
-  color: $text_color;
-  background-color: $base_color;
-
-  &:backdrop {
-    color: $backdrop_text_color;
-    background-color: $backdrop_base_color;
-  }
-
   &:selected,
   &:selected:focus {
     @extend %selected_items;
@@ -118,6 +104,15 @@ iconview {
   }
 }
 
+textview text {
+  @extend .view;
+
+  selection,
+  selection:focus { @extend %selected_items; }
+}
+
+iconview { @extend .view; }
+
 .rubberband,
 rubberband {
   border: 1px solid darken($selected_bg_color, 10%);
@@ -1430,7 +1425,8 @@ treeview.view {
 
   & rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props
 
-  &:selected {
+  &:selected,
+  &:selected:focus {
     border-radius: 0;
     @extend %selected_items;
   }

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 7fe0b7ac85060073441fa1d40edf9ff138afbaf1..f0b9cd8a0c4b8f7b21fedd0607dfe4302c7aa114 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -25,7 +25,7 @@
   .background:backdrop {
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #939695;
+    color: #949796;
     background-color: #393f3f; }
 
 /*
@@ -47,28 +47,19 @@
     background-color: #212424;
     color: #eeeeec; }
   .gtkstyle-fallback:disabled {
-    background-color: #323636;
-    color: #939695; }
+    background-color: #333636;
+    color: #949796; }
   .gtkstyle-fallback:selected {
     background-color: #215d9c;
     color: #ffffff; }
 
-textview text,
-.view {
+.view, textview text, iconview {
   color: white;
   background-color: #292929; }
-  textview text:backdrop,
-  .view:backdrop {
-    color: #d4d4d4;
+  .view:backdrop, textview text:backdrop, iconview:backdrop {
+    color: #d5d5d5;
     background-color: #2c2c2c; }
-
-iconview {
-  color: white;
-  background-color: #292929; }
-  iconview:backdrop {
-    color: #d4d4d4;
-    background-color: #2c2c2c; }
-  iconview:selected, iconview:selected:focus {
+  .view:selected, textview text:selected, iconview:selected, .view:selected:focus, textview text:selected:focus, iconview:selected:focus {
     border-radius: 3px; }
 
 .rubberband,
@@ -88,9 +79,9 @@ flowbox flowboxchild {
 label.separator {
   color: #eeeeec; }
   label.separator:backdrop {
-    color: #939695; }
+    color: #949796; }
 label:disabled {
-  color: #939695; }
+  color: #949796; }
   label:disabled:backdrop {
     color: #5d6767; }
 
@@ -108,18 +99,18 @@ assistant .sidebar {
     border-left: 1px solid #1c1f1f; }
   assistant .sidebar:backdrop {
     background-color: #2c2c2c;
-    border-color: #1e2222; }
+    border-color: #1f2222; }
 assistant.csd .sidebar {
   border-top-style: none; }
 assistant .sidebar label {
   padding: 6px 12px; }
 assistant .sidebar label.highlight {
-  background-color: #5d6261; }
+  background-color: #5d6262; }
 
 textview {
   background-color: #313434; }
   textview:backdrop {
-    background-color: #323535; }
+    background-color: #333636; }
 
 popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.osd, .csd popover.background.osd, .app-notification,
 .app-notification.frame, .osd .scale-popup, .osd {
@@ -161,7 +152,7 @@ entry, spinbutton {
   border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   background-color: #292929;
-  background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+  background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
   color: white;
   border-color: #1c1f1f;
   box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -174,7 +165,7 @@ entry, spinbutton {
   entry.flat, spinbutton.flat, entry.flat:focus, spinbutton.flat:focus {
     padding: 2px;
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     color: white;
     border-color: #1c1f1f;
     box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0);
@@ -182,29 +173,29 @@ entry, spinbutton {
     border-radius: 0; }
   entry:focus, spinbutton:focus {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     box-shadow: inset 0 0 0 1px #215d9c, 0 1px rgba(238, 238, 236, 0);
     border-color: #0f2b48; }
   entry:disabled, spinbutton:disabled {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
-    color: #939695;
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   entry:backdrop, spinbutton:backdrop {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
-    color: #d4d4d4;
-    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+    color: #d5d5d5;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #2c2c2c);
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   entry:backdrop:disabled, spinbutton:backdrop:disabled {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     color: #5d6767;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #323636);
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #333636);
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   entry progress, spinbutton progress {
     margin: 1px;
@@ -224,7 +215,7 @@ entry, spinbutton {
     border-color: #1a0000; }
     entry.error:focus, spinbutton.error:focus {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
       box-shadow: inset 0 0 0 1px #cc0000, 0 1px rgba(238, 238, 236, 0);
       border-color: #1a0000; }
     entry.error:selected, spinbutton.error:selected, entry.error:selected:focus, spinbutton.error:selected:focus {
@@ -234,22 +225,22 @@ entry, spinbutton {
     border-color: #432100; }
     entry.warning:focus, spinbutton.warning:focus {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
       box-shadow: inset 0 0 0 1px #f57900, 0 1px rgba(238, 238, 236, 0);
       border-color: #432100; }
     entry.warning:selected, spinbutton.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected:focus {
       background-color: #f57900; }
   entry image, spinbutton image {
-    color: #c6c6c5; }
+    color: #c7c7c5; }
     entry image:hover, spinbutton image:hover {
       color: #eeeeec; }
     entry image:active, spinbutton image:active {
       color: #215d9c; }
     entry image:backdrop, spinbutton image:backdrop {
-      color: #7e8080; }
+      color: #7f8281; }
   .osd entry, .osd spinbutton {
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -259,7 +250,7 @@ entry, spinbutton {
     -gtk-icon-shadow: 0 1px black; }
     .osd entry:focus, .osd spinbutton:focus {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
       color: white;
       border-color: #215d9c;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -269,7 +260,7 @@ entry, spinbutton {
       -gtk-icon-shadow: 0 1px black; }
     .osd entry:backdrop, .osd spinbutton:backdrop {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -279,10 +270,10 @@ entry, spinbutton {
       -gtk-icon-shadow: none; }
     .osd entry:disabled, .osd spinbutton:disabled {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
-      color: #878989;
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -296,7 +287,7 @@ entry, spinbutton {
   border-top-color: #252626;
   background-image: linear-gradient(to bottom, #292929); }
   .linked.vertical > entry:not(:disabled) + entry:not(:disabled):backdrop, .linked.vertical > spinbutton:not(:disabled) + entry:not(:disabled):backdrop, .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):backdrop, .linked.vertical > spinbutton:not(:disabled) + spinbutton:not(:disabled):backdrop {
-    border-top-color: #272929;
+    border-top-color: #282929;
     background-image: linear-gradient(to bottom, #2c2c2c); }
 .linked.vertical > entry:disabled + entry:disabled, .linked.vertical > spinbutton:disabled + entry:disabled, .linked.vertical > entry:disabled + spinbutton:disabled, .linked.vertical > spinbutton:disabled + spinbutton:disabled {
   border-top-color: #252626; }
@@ -381,8 +372,8 @@ button, headerbar button.titlebutton,
   button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop, button.flat:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop {
-    color: #939695;
-    border-color: #1e2222;
+    color: #949796;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -391,29 +382,32 @@ button, headerbar button.titlebutton,
     button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, button.sidebar-button:backdrop:active, headerbar button.titlebutton:backdrop:active,
     .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, button.sidebar-button:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
     .titlebar button.titlebutton:backdrop:checked {
-      color: #939695;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #2f3434);
+      color: #949796;
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #303535);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     button:backdrop:disabled, button.flat:backdrop:disabled, button.sidebar-button:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
     .titlebar button.titlebutton:backdrop:disabled {
       color: #5d6767;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #323636);
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button:backdrop:disabled > .label, button.flat:backdrop:disabled > .label, button.sidebar-button:backdrop:disabled > .label, headerbar button.titlebutton:backdrop:disabled > .label,
+      button:backdrop:disabled > .label, headerbar button.titlebutton:backdrop:disabled > .label,
+      .titlebar button.titlebutton:backdrop:disabled > .label, button.flat:backdrop:disabled > .label, button.sidebar-button:backdrop:disabled > .label, headerbar button.titlebutton:backdrop:disabled > .label,
       .titlebar button.titlebutton:backdrop:disabled > .label {
         color: inherit; }
     button:backdrop:disabled:active, button:backdrop:disabled:checked, button.flat:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
     .titlebar button.titlebutton:backdrop:disabled:active, button.flat:backdrop:disabled:checked, button.sidebar-button:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
     .titlebar button.titlebutton:backdrop:disabled:checked {
       color: #5d6767;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #262929);
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #272929);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button:backdrop:disabled:active > .label, button:backdrop:disabled:checked > .label, button.flat:backdrop:disabled:active > .label, button.sidebar-button:backdrop:disabled:active > .label, headerbar button.titlebutton:backdrop:disabled:active > .label,
+      button:backdrop:disabled:active > .label, headerbar button.titlebutton:backdrop:disabled:active > .label,
+      .titlebar button.titlebutton:backdrop:disabled:active > .label, button:backdrop:disabled:checked > .label, headerbar button.titlebutton:backdrop:disabled:checked > .label,
+      .titlebar button.titlebutton:backdrop:disabled:checked > .label, button.flat:backdrop:disabled:active > .label, button.sidebar-button:backdrop:disabled:active > .label, headerbar button.titlebutton:backdrop:disabled:active > .label,
       .titlebar button.titlebutton:backdrop:disabled:active > .label, button.flat:backdrop:disabled:checked > .label, button.sidebar-button:backdrop:disabled:checked > .label, headerbar button.titlebutton:backdrop:disabled:checked > .label,
       .titlebar button.titlebutton:backdrop:disabled:checked > .label {
         color: inherit; }
@@ -429,20 +423,23 @@ button, headerbar button.titlebutton,
     -gtk-icon-shadow: none; }
   button:disabled, headerbar button.titlebutton:disabled,
   .titlebar button.titlebutton:disabled {
-    color: #939695;
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-    button:disabled > .label {
+    button:disabled > .label, headerbar button.titlebutton:disabled > .label,
+    .titlebar button.titlebutton:disabled > .label {
       color: inherit; }
     button:disabled:active, button:disabled:checked {
-      color: #939695;
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #2f3333, #323636);
+      background-image: linear-gradient(to bottom, #313434, #333636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button:disabled:active > .label, button:disabled:checked > .label {
+      button:disabled:active > .label, headerbar button.titlebutton:disabled:active > .label,
+      .titlebar button.titlebutton:disabled:active > .label, button:disabled:checked > .label, headerbar button.titlebutton:disabled:checked > .label,
+      .titlebar button.titlebutton:disabled:checked > .label {
         color: inherit; }
   button.osd, headerbar button.osd.titlebutton,
   .titlebar button.osd.titlebutton {
@@ -485,9 +482,9 @@ button, headerbar button.titlebutton,
       border: none;
       box-shadow: none; }
     button.osd:disabled, button.osd:backdrop:disabled {
-      color: #878989;
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -535,9 +532,9 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, popover.background.touch-selection button:backdrop:disabled, popover.background.magnifier button:backdrop:disabled, .app-notification button:backdrop:disabled, .osd button:disabled, .osd button:backdrop:disabled {
-      color: #878989;
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -594,9 +591,9 @@ button, headerbar button.titlebutton,
       .titlebar .app-notification button.titlebutton:disabled, .osd button.flat:disabled, .osd button.sidebar-button:disabled, .osd headerbar button.titlebutton:disabled, headerbar .osd button.titlebutton:disabled,
       .osd .titlebar button.titlebutton:disabled,
       .titlebar .osd button.titlebutton:disabled {
-        color: #878989;
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -686,7 +683,7 @@ button, headerbar button.titlebutton,
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0); }
     button.suggested-action:backdrop, button.suggested-action.flat:backdrop, button.suggested-action.sidebar-button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
     .titlebar button.suggested-action.titlebutton:backdrop {
-      color: #d2deeb;
+      color: #d3dfeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -695,29 +692,32 @@ button, headerbar button.titlebutton,
       button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, button.suggested-action.sidebar-button:backdrop:active, headerbar button.suggested-action.titlebutton:backdrop:active,
       .titlebar button.suggested-action.titlebutton:backdrop:active, button.suggested-action.flat:backdrop:checked, button.suggested-action.sidebar-button:backdrop:checked, headerbar button.suggested-action.titlebutton:backdrop:checked,
       .titlebar button.suggested-action.titlebutton:backdrop:checked {
-        color: #d0d9e2;
+        color: #d1dae3;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #184472);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       button.suggested-action:backdrop:disabled, button.suggested-action.flat:backdrop:disabled, button.suggested-action.sidebar-button:backdrop:disabled, headerbar button.suggested-action.titlebutton:backdrop:disabled,
       .titlebar button.suggested-action.titlebutton:backdrop:disabled {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-        button.suggested-action:backdrop:disabled > .label, button.suggested-action.flat:backdrop:disabled > .label, button.suggested-action.sidebar-button:backdrop:disabled > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
+        button.suggested-action:backdrop:disabled > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
+        .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label, button.suggested-action.flat:backdrop:disabled > .label, button.suggested-action.sidebar-button:backdrop:disabled > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
         .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label {
           color: inherit; }
         button.suggested-action:backdrop:disabled:active, button.suggested-action:backdrop:disabled:checked, button.suggested-action.flat:backdrop:disabled:active, button.suggested-action.sidebar-button:backdrop:disabled:active, headerbar button.suggested-action.titlebutton:backdrop:disabled:active,
         .titlebar button.suggested-action.titlebutton:backdrop:disabled:active, button.suggested-action.flat:backdrop:disabled:checked, button.suggested-action.sidebar-button:backdrop:disabled:checked, headerbar button.suggested-action.titlebutton:backdrop:disabled:checked,
         .titlebar button.suggested-action.titlebutton:backdrop:disabled:checked {
-          color: #6c88a5;
+          color: #6c88a7;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1d4876);
+          background-image: linear-gradient(to bottom, #1d4877);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-          button.suggested-action:backdrop:disabled:active > .label, button.suggested-action:backdrop:disabled:checked > .label, button.suggested-action.flat:backdrop:disabled:active > .label, button.suggested-action.sidebar-button:backdrop:disabled:active > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:active > .label,
+          button.suggested-action:backdrop:disabled:active > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:active > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:disabled:active > .label, button.suggested-action:backdrop:disabled:checked > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:checked > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:disabled:checked > .label, button.suggested-action.flat:backdrop:disabled:active > .label, button.suggested-action.sidebar-button:backdrop:disabled:active > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:active > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:disabled:active > .label, button.suggested-action.flat:backdrop:disabled:checked > .label, button.suggested-action.sidebar-button:backdrop:disabled:checked > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:checked > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:disabled:checked > .label {
             color: inherit; }
@@ -733,20 +733,23 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       color: rgba(33, 93, 156, 0.8); }
     button.suggested-action:disabled {
-      color: #939695;
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.suggested-action:disabled > .label {
+      button.suggested-action:disabled > .label, headerbar button.suggested-action.titlebutton:disabled > .label,
+      .titlebar button.suggested-action.titlebutton:disabled > .label {
         color: inherit; }
       button.suggested-action:disabled:active, button.suggested-action:disabled:checked {
-        color: #a4b5c8;
+        color: #a5b6c9;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #1b436f, #1d4876);
+        background-image: linear-gradient(to bottom, #1b4470, #1d4877);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-        button.suggested-action:disabled:active > .label, button.suggested-action:disabled:checked > .label {
+        button.suggested-action:disabled:active > .label, headerbar button.suggested-action.titlebutton:disabled:active > .label,
+        .titlebar button.suggested-action.titlebutton:disabled:active > .label, button.suggested-action:disabled:checked > .label, headerbar button.suggested-action.titlebutton:disabled:checked > .label,
+        .titlebar button.suggested-action.titlebutton:disabled:checked > .label {
           color: inherit; }
     .osd button.suggested-action {
       color: #eeeeec;
@@ -776,9 +779,9 @@ button, headerbar button.titlebutton,
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.suggested-action:disabled, .osd button.suggested-action:backdrop:disabled {
-        color: #878989;
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -833,7 +836,7 @@ button, headerbar button.titlebutton,
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0); }
     button.destructive-action:backdrop, button.destructive-action.flat:backdrop, button.destructive-action.sidebar-button:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
     .titlebar button.destructive-action.titlebutton:backdrop {
-      color: #f6cfcf;
+      color: #f7cfcf;
       border-color: #5e0707;
       background-image: linear-gradient(to bottom, #d51010);
       text-shadow: none;
@@ -849,22 +852,25 @@ button, headerbar button.titlebutton,
       button.destructive-action:backdrop:disabled, button.destructive-action.flat:backdrop:disabled, button.destructive-action.sidebar-button:backdrop:disabled, headerbar button.destructive-action.titlebutton:backdrop:disabled,
       .titlebar button.destructive-action.titlebutton:backdrop:disabled {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-        button.destructive-action:backdrop:disabled > .label, button.destructive-action.flat:backdrop:disabled > .label, button.destructive-action.sidebar-button:backdrop:disabled > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
+        button.destructive-action:backdrop:disabled > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
+        .titlebar button.destructive-action.titlebutton:backdrop:disabled > .label, button.destructive-action.flat:backdrop:disabled > .label, button.destructive-action.sidebar-button:backdrop:disabled > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
         .titlebar button.destructive-action.titlebutton:backdrop:disabled > .label {
           color: inherit; }
         button.destructive-action:backdrop:disabled:active, button.destructive-action:backdrop:disabled:checked, button.destructive-action.flat:backdrop:disabled:active, button.destructive-action.sidebar-button:backdrop:disabled:active, headerbar button.destructive-action.titlebutton:backdrop:disabled:active,
         .titlebar button.destructive-action.titlebutton:backdrop:disabled:active, button.destructive-action.flat:backdrop:disabled:checked, button.destructive-action.sidebar-button:backdrop:disabled:checked, headerbar button.destructive-action.titlebutton:backdrop:disabled:checked,
         .titlebar button.destructive-action.titlebutton:backdrop:disabled:checked {
-          color: #c36464;
+          color: #c46565;
           border-color: #5e0707;
-          background-image: linear-gradient(to bottom, #a41111);
+          background-image: linear-gradient(to bottom, #a41212);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-          button.destructive-action:backdrop:disabled:active > .label, button.destructive-action:backdrop:disabled:checked > .label, button.destructive-action.flat:backdrop:disabled:active > .label, button.destructive-action.sidebar-button:backdrop:disabled:active > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:active > .label,
+          button.destructive-action:backdrop:disabled:active > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:active > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:disabled:active > .label, button.destructive-action:backdrop:disabled:checked > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:checked > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:disabled:checked > .label, button.destructive-action.flat:backdrop:disabled:active > .label, button.destructive-action.sidebar-button:backdrop:disabled:active > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:active > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:disabled:active > .label, button.destructive-action.flat:backdrop:disabled:checked > .label, button.destructive-action.sidebar-button:backdrop:disabled:checked > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:checked > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:disabled:checked > .label {
             color: inherit; }
@@ -880,20 +886,23 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       color: rgba(213, 16, 16, 0.8); }
     button.destructive-action:disabled {
-      color: #939695;
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-      button.destructive-action:disabled > .label {
+      button.destructive-action:disabled > .label, headerbar button.destructive-action.titlebutton:disabled > .label,
+      .titlebar button.destructive-action.titlebutton:disabled > .label {
         color: inherit; }
       button.destructive-action:disabled:active, button.destructive-action:disabled:checked {
-        color: #da9f9f;
+        color: #dba0a0;
         border-color: #5e0707;
-        background-image: linear-gradient(to bottom, #9d1010, #a41111);
+        background-image: linear-gradient(to bottom, #9d1111, #a41212);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-        button.destructive-action:disabled:active > .label, button.destructive-action:disabled:checked > .label {
+        button.destructive-action:disabled:active > .label, headerbar button.destructive-action.titlebutton:disabled:active > .label,
+        .titlebar button.destructive-action.titlebutton:disabled:active > .label, button.destructive-action:disabled:checked > .label, headerbar button.destructive-action.titlebutton:disabled:checked > .label,
+        .titlebar button.destructive-action.titlebutton:disabled:checked > .label {
           color: inherit; }
     .osd button.destructive-action {
       color: #eeeeec;
@@ -923,9 +932,9 @@ button, headerbar button.titlebutton,
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.destructive-action:disabled, .osd button.destructive-action:backdrop:disabled {
-        color: #878989;
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -959,10 +968,12 @@ button, headerbar button.titlebutton,
       padding-right: 6px;
       padding-top: 3px;
       padding-bottom: 3px; }
-    .stack-switcher > button.text-button {
+    .stack-switcher > button.text-button, headerbar .stack-switcher > button.text-button.titlebutton,
+    .titlebar .stack-switcher > button.text-button.titlebutton {
       padding-left: 10px;
       padding-right: 10px; }
-    .stack-switcher > button.image-button {
+    .stack-switcher > button.image-button, headerbar .stack-switcher > button.image-button.titlebutton,
+    .titlebar .stack-switcher > button.image-button.titlebutton {
       padding-left: 2px;
       padding-right: 2px; }
     .stack-switcher > button.needs-attention:active > label, .stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > button.needs-attention:checked > image {
@@ -989,7 +1000,7 @@ button, headerbar button.titlebutton,
   .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), stacksidebar row.needs-attention > label:dir(rtl) {
     background-position: left 3px, left 2px; }
 
-.inline-toolbar toolbutton > button,
+.inline-toolbar toolbutton > button, .inline-toolbar headerbar toolbutton > button.titlebutton,
 .inline-toolbar .titlebar toolbutton > button.titlebutton,
 .titlebar .inline-toolbar toolbutton > button.titlebutton {
   color: #eeeeec;
@@ -999,7 +1010,8 @@ button, headerbar button.titlebutton,
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar toolbutton > button:hover {
+  .inline-toolbar toolbutton > button:hover, .inline-toolbar headerbar toolbutton > button.titlebutton:hover,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:hover {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -1013,7 +1025,9 @@ button, headerbar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
+  .inline-toolbar toolbutton > button:active, .inline-toolbar headerbar toolbutton > button.titlebutton:active,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:active, .inline-toolbar toolbutton > button:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:checked,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:checked {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #1c1f1f;
@@ -1021,47 +1035,56 @@ button, headerbar button.titlebutton,
     text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar toolbutton > button:disabled {
-    color: #939695;
+  .inline-toolbar toolbutton > button:disabled, .inline-toolbar headerbar toolbutton > button.titlebutton:disabled,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:disabled {
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .inline-toolbar toolbutton > button:disabled > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
-    color: #939695;
+  .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar headerbar toolbutton > button.titlebutton:disabled:active,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:disabled:active, .inline-toolbar toolbutton > button:disabled:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:disabled:checked,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:disabled:checked {
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #2f3333, #323636);
+    background-image: linear-gradient(to bottom, #313434, #333636);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .inline-toolbar toolbutton > button:disabled:active > .label, .inline-toolbar toolbutton > button:disabled:checked > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:backdrop {
-    color: #939695;
-    border-color: #1e2222;
+  .inline-toolbar toolbutton > button:backdrop, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop {
+    color: #949796;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
-    color: #939695;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #2f3434);
+  .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:active,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:checked,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:checked {
+    color: #949796;
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #303535);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
-  .inline-toolbar toolbutton > button:backdrop:disabled {
+  .inline-toolbar toolbutton > button:backdrop:disabled, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:disabled,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:disabled {
     color: #5d6767;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #323636);
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .inline-toolbar toolbutton > button:backdrop:disabled > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked {
+  .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:disabled:active,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:disabled:checked,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:disabled:checked {
     color: #5d6767;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #262929);
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #272929);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
     .inline-toolbar toolbutton > button:backdrop:disabled:active > .label, .inline-toolbar toolbutton > button:backdrop:disabled:checked > .label {
       color: inherit; }
@@ -1087,7 +1110,8 @@ headerbar .inline-toolbar toolbutton:backdrop > button.titlebutton,
   border-radius: 0;
   border-right-style: none; }
 
-.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, headerbar .linked > button.titlebutton:first-child,
+.titlebar .linked > button.titlebutton:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
 .inline-toolbar.location-bar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:first-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:first-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:first-child > button.titlebutton, headerbar .inline-toolbar toolbutton:first-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:first-child > button.titlebutton,
@@ -1106,7 +1130,8 @@ headerbar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton, .linked > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
-.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, headerbar .linked > button.titlebutton:last-child,
+.titlebar .linked > button.titlebutton:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
 .inline-toolbar.location-bar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:last-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:last-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:last-child > button.titlebutton, headerbar .inline-toolbar toolbutton:last-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:last-child > button.titlebutton,
@@ -1126,7 +1151,8 @@ headerbar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton,
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
-.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, headerbar .linked > button.titlebutton:only-child,
+.titlebar .linked > button.titlebutton:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
 .inline-toolbar.location-bar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:only-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:only-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:only-child > button.titlebutton, headerbar .inline-toolbar toolbutton:only-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:only-child > button.titlebutton,
@@ -1146,18 +1172,22 @@ headerbar .inline-toolbar toolbutton:backdrop:only-child > button.titlebutton,
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > button.combo {
+.linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > button, headerbar .linked.vertical > button.titlebutton,
+.titlebar .linked.vertical > button.titlebutton, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > button.combo {
   border-style: solid solid none solid;
   border-radius: 0; }
 
-.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > button.combo {
+.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, headerbar .linked.vertical > button.titlebutton:first-child,
+.titlebar .linked.vertical > button.titlebutton:first-child, .linked.vertical > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
-.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > button.combo {
+.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, headerbar .linked.vertical > button.titlebutton:last-child,
+.titlebar .linked.vertical > button.titlebutton:last-child, .linked.vertical > combobox:last-child > button.combo {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
-.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > button.combo {
+.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, headerbar .linked.vertical > button.titlebutton:only-child,
+.titlebar .linked.vertical > button.titlebutton:only-child, .linked.vertical > combobox:only-child > button.combo {
   border-radius: 3px;
   border-style: solid; }
 
@@ -1193,7 +1223,7 @@ modelbutton.flat,
   outline-offset: -2px; }
   modelbutton.flat:hover,
   .menuitem.button.flat:hover {
-    background-color: #4b5050; }
+    background-color: #4b5150; }
   modelbutton.flat check:last-child,
   modelbutton.flat radio:last-child,
   .menuitem.button.flat check:last-child,
@@ -1246,13 +1276,13 @@ headerbar button.titlebutton:visited,
     color: #74aae2; }
     *:selected *:link:hover, *:selected button:hover:link,
     *:selected button:hover:visited {
-      color: #e8eef5; }
+      color: #e9eff5; }
   *:link:active, button:active:link,
   button:active:visited {
     color: #4a90d9; }
     *:selected *:link:active, *:selected button:active:link,
     *:selected button:active:visited {
-      color: #d2deeb; }
+      color: #d3dfeb; }
   *:link:backdrop, button:backdrop:link,
   button:backdrop:visited, *:link:backdrop:hover, button:backdrop:hover:link,
   button:backdrop:hover:visited, *:link:backdrop:hover:selected, button:backdrop:hover:selected:link,
@@ -1263,7 +1293,7 @@ headerbar button.titlebutton:visited,
   button:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:link,
   headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link,
   *:selected button:visited {
-    color: #d2deeb; }
+    color: #d3dfeb; }
 
 button:link, headerbar button.titlebutton:link,
 .titlebar button.titlebutton:link,
@@ -1276,9 +1306,10 @@ headerbar button.titlebutton:visited,
   button:visited:active,
   button:visited:checked {
     text-shadow: none; }
-  button:link > label,
+  button:link > label, headerbar button.titlebutton:link > label,
   .titlebar button.titlebutton:link > label,
   button:visited > label,
+  headerbar button.titlebutton:visited > label,
   .titlebar button.titlebutton:visited > label {
     text-decoration-line: underline; }
 
@@ -1291,7 +1322,7 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
   background-image: none;
   border-style: none none none solid;
   border-color: rgba(28, 31, 31, 0.3);
-  color: #dadad8;
+  color: #dadad9;
   border-radius: 0;
   box-shadow: none; }
   spinbutton:not(.vertical) button:dir(rtl) {
@@ -1300,13 +1331,13 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     color: #eeeeec;
     background-color: rgba(238, 238, 236, 0.05); }
   spinbutton:not(.vertical) button:disabled {
-    color: rgba(147, 150, 149, 0.3); }
+    color: rgba(148, 151, 150, 0.3); }
   spinbutton:not(.vertical) button:active {
     box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
     background-color: rgba(0, 0, 0, 0.1); }
   spinbutton:not(.vertical) button:backdrop {
-    color: #888b8a;
-    border-color: rgba(30, 34, 34, 0.3);
+    color: #8a8c8b;
+    border-color: rgba(31, 34, 34, 0.3);
     background-color: transparent; }
   spinbutton:not(.vertical) button:backdrop:disabled {
     background-image: none;
@@ -1359,7 +1390,7 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #878989;
+    color: #878a89;
     border-color: rgba(0, 0, 0, 0.5);
     -gtk-icon-shadow: none;
     box-shadow: none; }
@@ -1407,29 +1438,31 @@ spinbutton.vertical {
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); }
       spinbutton.vertical button:first-child:disabled {
-        color: #939695;
+        color: #949796;
         border-color: #1c1f1f;
-        background-image: linear-gradient(to bottom, #323636);
+        background-image: linear-gradient(to bottom, #333636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        spinbutton.vertical button:first-child:disabled > .label {
+        spinbutton.vertical button:first-child:disabled > .label, spinbutton.vertical headerbar button.titlebutton:first-child:disabled > .label,
+        spinbutton.vertical .titlebar button.titlebutton:first-child:disabled > .label {
           color: inherit; }
       spinbutton.vertical button:first-child:backdrop {
-        color: #939695;
-        border-color: #1e2222;
+        color: #949796;
+        border-color: #1f2222;
         background-image: linear-gradient(to bottom, #393f3f);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         spinbutton.vertical button:first-child:backdrop:disabled {
           color: #5d6767;
-          border-color: #1e2222;
-          background-image: linear-gradient(to bottom, #323636);
+          border-color: #1f2222;
+          background-image: linear-gradient(to bottom, #333636);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-          spinbutton.vertical button:first-child:backdrop:disabled > .label {
+          spinbutton.vertical button:first-child:backdrop:disabled > .label, spinbutton.vertical headerbar button.titlebutton:first-child:backdrop:disabled > .label,
+          spinbutton.vertical .titlebar button.titlebutton:first-child:backdrop:disabled > .label {
             color: inherit; }
   spinbutton.vertical button:first-child, spinbutton.vertical button:first-child:active, spinbutton.vertical button:first-child:hover, spinbutton.vertical button:first-child:disabled, spinbutton.vertical button:first-child:backdrop {
     border-radius: 3px 3px 0 0;
@@ -1465,9 +1498,9 @@ spinbutton.vertical {
     -gtk-icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   .osd spinbutton.vertical button:first-child:disabled {
-    color: #878989;
+    color: #878a89;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -1495,16 +1528,16 @@ treeview spinbutton spinbutton:focus {
 combobox {
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); }
-  combobox > button.combo,
+  combobox > button.combo, headerbar combobox > button.combo.titlebutton,
   .titlebar combobox > button.combo.titlebutton {
     padding-left: 8px;
     padding-right: 8px; }
   combobox:disabled {
-    color: #939695;
+    color: #949796;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
-    color: #939695;
+    color: #949796;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:disabled {
@@ -1521,11 +1554,13 @@ combobox {
   combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0; }
-  combobox > button.combo:not(:only-child):dir(ltr) {
+  combobox > button.combo:not(:only-child):dir(ltr), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(ltr),
+  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(ltr) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
     border-left-style: none; }
-  combobox > button.combo:not(:only-child):dir(rtl) {
+  combobox > button.combo:not(:only-child):dir(rtl), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(rtl),
+  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(rtl) {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
     border-right-style: none; }
@@ -1578,11 +1613,11 @@ searchbar,
   border-style: solid;
   border-color: #1c1f1f;
   background-color: #303535;
-  box-shadow: inset 0 2px 3px -1px #242727, 0 1px rgba(238, 238, 236, 0); }
+  box-shadow: inset 0 2px 3px -1px #242828, 0 1px rgba(238, 238, 236, 0); }
   .inline-toolbar:backdrop, searchbar:backdrop,
   .location-bar:backdrop {
-    border-color: #1e2222;
-    background-color: #2f3434;
+    border-color: #1f2222;
+    background-color: #303535;
     box-shadow: none; }
 
 /***************
@@ -1601,7 +1636,7 @@ headerbar {
   box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); }
   .titlebar:backdrop:not(headerbar),
   headerbar:backdrop {
-    border-color: #1e2222;
+    border-color: #1f2222;
     background-color: #393f3f;
     background-image: none;
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); }
@@ -1621,11 +1656,11 @@ headerbar {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #0f2b48;
     background-image: linear-gradient(to bottom, #256ab1, #215d9c);
-    box-shadow: inset 0 -1px #1a4b7e, inset 0 1px rgba(40, 98, 158, 0.535); }
+    box-shadow: inset 0 -1px #1b4c7f, inset 0 1px rgba(40, 98, 159, 0.535); }
     .selection-mode.titlebar:backdrop:not(headerbar),
     headerbar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #215d9c);
-      box-shadow: inset 0 1px rgba(43, 100, 160, 0.442); }
+      box-shadow: inset 0 1px rgba(44, 100, 160, 0.442); }
     .selection-mode.titlebar:not(headerbar) button,
     headerbar.selection-mode button,
     headerbar.selection-mode .titlebar button.titlebutton,
@@ -1636,7 +1671,7 @@ headerbar {
       background-image: linear-gradient(to bottom, #1f5894, #1d538b 60%, #1b4e83);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 158, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0); }
       .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.sidebar-button,
       .selection-mode.titlebar:not(headerbar) button.titlebutton,
       headerbar.selection-mode button.flat,
@@ -1662,7 +1697,7 @@ headerbar {
         background-image: linear-gradient(to bottom, #2260a0, #1f5894 60%, #1d538b);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.65553);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.65553);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 158, 0); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0); }
       .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked,
       headerbar.selection-mode button:active,
       headerbar.selection-mode button:checked {
@@ -1672,19 +1707,19 @@ headerbar {
         background-image: linear-gradient(to bottom, #194776, #1c5187);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
-        box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(40, 98, 158, 0); }
+        box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(40, 98, 159, 0); }
       .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop,
       .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop,
       headerbar.selection-mode button:backdrop,
       headerbar.selection-mode button.flat:backdrop,
       headerbar.selection-mode button.sidebar-button:backdrop,
       headerbar.selection-mode button.titlebutton:backdrop {
-        color: #d2deeb;
+        color: #d3dfeb;
         border-color: #0b1e33;
         background-image: linear-gradient(to bottom, #215d9c);
         text-shadow: none;
         -gtk-icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
         -gtk-icon-effect: none;
         border-color: #0f2b48; }
         .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:active,
@@ -1698,10 +1733,10 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:checked,
         headerbar.selection-mode button.titlebutton:backdrop:checked {
-          color: #d0d9e2;
+          color: #d1dae3;
           border-color: #0b1e33;
           background-image: linear-gradient(to bottom, #184472);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
           border-color: #0f2b48; }
         .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled,
         .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled,
@@ -1709,19 +1744,21 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:disabled,
         headerbar.selection-mode button.sidebar-button:backdrop:disabled,
         headerbar.selection-mode button.titlebutton:backdrop:disabled {
-          color: #6f90b2;
+          color: #6f91b4;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #22558a);
+          background-image: linear-gradient(to bottom, #22558b);
           text-shadow: none;
           -gtk-icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
           border-color: #0f2b48; }
-          .selection-mode.titlebar:not(headerbar) button:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled > .label,
+          .selection-mode.titlebar:not(headerbar) button:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled > .label,
           .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled > .label,
           headerbar.selection-mode button:backdrop:disabled > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled > .label,
           headerbar.selection-mode button.flat:backdrop:disabled > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:disabled > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:disabled > .label {
+          headerbar.selection-mode button.titlebutton:backdrop:disabled > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled > .label {
             color: inherit; }
         .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active,
         .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked,
@@ -1734,22 +1771,26 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:disabled:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:disabled:checked,
         headerbar.selection-mode button.titlebutton:backdrop:disabled:checked {
-          color: #6c88a5;
+          color: #6c88a7;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1d4876);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0);
+          background-image: linear-gradient(to bottom, #1d4877);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
           border-color: #0f2b48; }
-          .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active > .label,
-          .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked > .label,
+          .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled:active > .label,
+          .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled:checked > .label,
           .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:checked > .label,
           headerbar.selection-mode button:backdrop:disabled:active > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:active > .label,
           headerbar.selection-mode button:backdrop:disabled:checked > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:checked > .label,
           headerbar.selection-mode button.flat:backdrop:disabled:active > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:disabled:active > .label,
           headerbar.selection-mode button.titlebutton:backdrop:disabled:active > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:active > .label,
           headerbar.selection-mode button.flat:backdrop:disabled:checked > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:disabled:checked > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:disabled:checked > .label {
+          headerbar.selection-mode button.titlebutton:backdrop:disabled:checked > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:checked > .label {
             color: inherit; }
       .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop,
       .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:disabled,
@@ -1772,25 +1813,28 @@ headerbar {
         -gtk-icon-shadow: none; }
       .selection-mode.titlebar:not(headerbar) button:disabled,
       headerbar.selection-mode button:disabled {
-        color: #90aac4;
+        color: #91aac5;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558a);
+        background-image: linear-gradient(to bottom, #22558b);
         text-shadow: none;
         -gtk-icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0); }
-        .selection-mode.titlebar:not(headerbar) button:disabled > .label,
-        headerbar.selection-mode button:disabled > .label {
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0); }
+        .selection-mode.titlebar:not(headerbar) button:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:disabled > .label,
+        headerbar.selection-mode button:disabled > .label,
+        headerbar.selection-mode .titlebar button.titlebutton:disabled > .label {
           color: inherit; }
         .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked,
         headerbar.selection-mode button:disabled:active,
         headerbar.selection-mode button:disabled:checked {
-          color: #a4b5c8;
+          color: #a5b6c9;
           border-color: #0b1e33;
-          background-image: linear-gradient(to bottom, #1b436f, #1d4876);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0); }
-          .selection-mode.titlebar:not(headerbar) button:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button:disabled:checked > .label,
+          background-image: linear-gradient(to bottom, #1b4470, #1d4877);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0); }
+          .selection-mode.titlebar:not(headerbar) button:disabled:active > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:disabled:checked > .label,
           headerbar.selection-mode button:disabled:active > .label,
-          headerbar.selection-mode button:disabled:checked > .label {
+          headerbar.selection-mode .titlebar button.titlebutton:disabled:active > .label,
+          headerbar.selection-mode button:disabled:checked > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:disabled:checked > .label {
             color: inherit; }
       .selection-mode.titlebar:not(headerbar) button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1800,7 +1844,7 @@ headerbar {
         background-image: linear-gradient(to bottom, #343a3a, #2f3434 60%, #2a2f2f);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 158, 0);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0);
         border-color: #0f2b48; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:hover,
         headerbar.selection-mode button.suggested-action:hover {
@@ -1816,7 +1860,7 @@ headerbar {
           background-image: linear-gradient(to bottom, #3b4242, #343a3a 60%, #2f3434);
           text-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
           -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 158, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(40, 98, 159, 0);
           border-color: #0f2b48; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -1826,40 +1870,42 @@ headerbar {
           background-image: linear-gradient(to bottom, #232727, #2d3232);
           text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
           -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
-          box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(40, 98, 158, 0);
+          box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(40, 98, 159, 0);
           border-color: #0f2b48; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
-          color: #939695;
+          color: #949796;
           border-color: #1c1f1f;
-          background-image: linear-gradient(to bottom, #323636);
+          background-image: linear-gradient(to bottom, #333636);
           text-shadow: none;
           -gtk-icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
           border-color: #0f2b48; }
-          .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled > .label,
-          headerbar.selection-mode button.suggested-action:disabled > .label {
+          .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.suggested-action.titlebutton:disabled > .label,
+          headerbar.selection-mode button.suggested-action:disabled > .label,
+          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:disabled > .label {
             color: inherit; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop,
         headerbar.selection-mode button.suggested-action:backdrop {
-          color: #939695;
-          border-color: #1e2222;
+          color: #949796;
+          border-color: #1f2222;
           background-image: linear-gradient(to bottom, #393f3f);
           text-shadow: none;
           -gtk-icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
           border-color: #0f2b48; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled,
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
           color: #5d6767;
-          border-color: #1e2222;
-          background-image: linear-gradient(to bottom, #323636);
+          border-color: #1f2222;
+          background-image: linear-gradient(to bottom, #333636);
           text-shadow: none;
           -gtk-icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 158, 0);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(40, 98, 159, 0);
           border-color: #0f2b48; }
-          .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled > .label,
-          headerbar.selection-mode button.suggested-action:backdrop:disabled > .label {
+          .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
+          headerbar.selection-mode button.suggested-action:backdrop:disabled > .label,
+          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label {
             color: inherit; }
     .selection-mode.titlebar:not(headerbar) .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop,
     headerbar.selection-mode .selection-menu,
@@ -1962,19 +2008,19 @@ treeview.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #8b8b8a;
+  border-left-color: #8c8c8b;
   border-top-color: #393f3f; }
-  treeview.view:selected {
+  treeview.view:selected, treeview.view:selected:focus {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: #90aecd;
+    border-left-color: #90aece;
     border-top-color: rgba(238, 238, 236, 0.1); }
   treeview.view:disabled {
-    color: #939695; }
+    color: #949796; }
     treeview.view:disabled:selected {
-      color: #799dc3; }
+      color: #7a9ec4; }
       treeview.view:disabled:selected:backdrop {
-        color: #638db9; }
+        color: #648eba; }
     treeview.view:disabled:backdrop {
       color: #5d6767; }
   treeview.view.separator {
@@ -1982,15 +2028,15 @@ treeview.view {
     treeview.view.separator:backdrop {
       color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
-    border-left-color: #666a6a;
+    border-left-color: #676b6b;
     border-top: #393f3f; }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #87a5c4; }
+    border-color: #88a6c4; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #b2b2b1; }
+    color: #b3b3b2; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
@@ -2004,7 +2050,7 @@ treeview.view {
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #747675; }
+      color: #757776; }
   treeview.view.progressbar {
     border: 1px solid #0f2b48;
     border-radius: 4px;
@@ -2028,13 +2074,13 @@ treeview.view {
   treeview.view header button,
   treeview.view header .titlebar button.titlebutton,
   .titlebar treeview.view header button.titlebutton {
-    color: #8b8b8a;
+    color: #8c8c8b;
     background-color: #292929;
     font-weight: bold;
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #bcbcbb;
+      color: #bdbdbc;
       box-shadow: none;
       transition: none; }
     treeview.view header button:active {
@@ -2063,7 +2109,7 @@ treeview.view header .titlebar button.titlebutton,
   treeview.view header button:backdrop {
     border-color: #393f3f;
     border-style: none solid solid none;
-    color: #666a6a;
+    color: #676b6b;
     background-image: none;
     background-color: #2c2c2c; }
     treeview.view header button:backdrop:disabled {
@@ -2090,7 +2136,7 @@ menubar,
       color: #4a90d9; }
     menubar > menuitem:disabled,
     .menubar > menuitem:disabled {
-      color: #939695;
+      color: #949796;
       box-shadow: none; }
 
 menu,
@@ -2104,7 +2150,7 @@ menu,
     border: none; }
   menu:backdrop,
   .menu:backdrop {
-    background-color: #2e2f2f; }
+    background-color: #2f3030; }
   menu menuitem,
   .menu menuitem {
     text-shadow: none;
@@ -2116,14 +2162,14 @@ menu,
       background-color: #215d9c; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
-      color: #939695; }
+      color: #949796; }
       menu menuitem:disabled:backdrop,
       .menu menuitem:disabled:backdrop {
         color: #5d6767; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
-      color: #939695;
+      color: #949796;
       background-color: transparent; }
     menu menuitem arrow,
     .menu menuitem arrow {
@@ -2146,14 +2192,14 @@ menu,
     menu arrow.top,
     .menu arrow.top {
       -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
-      border-bottom: 1px solid #3c3c3c; }
+      border-bottom: 1px solid #3d3d3d; }
     menu arrow.bottom,
     .menu arrow.bottom {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-      border-top: 1px solid #3c3c3c; }
+      border-top: 1px solid #3d3d3d; }
     menu arrow:hover,
     .menu arrow:hover {
-      background-color: #3c3c3c; }
+      background-color: #3d3d3d; }
     menu arrow:disabled,
     .menu arrow:disabled {
       color: transparent;
@@ -2186,6 +2232,8 @@ popover.background {
     box-shadow: none; }
   popover.background > list,
   popover.background > .view,
+  textview popover.background > text,
+  popover.background > iconview,
   popover.background > toolbar,
   popover.background > .inline-toolbar,
   popover.background > searchbar,
@@ -2220,7 +2268,7 @@ notebook {
   notebook.frame {
     border: 1px solid #1c1f1f; }
     notebook.frame:backdrop {
-      border-color: #1e2222; }
+      border-color: #1f2222; }
   notebook header {
     background-color: #303535; }
     .frame notebook header {
@@ -2234,11 +2282,11 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: #1e2222; }
+        border-color: #1f2222; }
     notebook header.top {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #1c1f1f; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px #1e2222; }
+        box-shadow: inset 0 -1px #1f2222; }
       notebook header.top tab {
         padding: 8px 20px;
         border-bottom-width: 3px; }
@@ -2250,7 +2298,7 @@ notebook {
     notebook header.bottom {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #1c1f1f; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px #1e2222; }
+        box-shadow: inset 0 1px #1f2222; }
       notebook header.bottom tab {
         padding: 8px 20px;
         border-top-width: 3px; }
@@ -2262,7 +2310,7 @@ notebook {
     notebook header.right {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #1c1f1f; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 #1e2222; }
+        box-shadow: inset 1px 0 #1f2222; }
       notebook header.right tab {
         padding: 5px 20px;
         border-left-width: 3px; }
@@ -2272,7 +2320,7 @@ notebook {
     notebook header.left {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #1c1f1f; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 #1e2222; }
+        box-shadow: inset -1px 0 #1f2222; }
       notebook header.left tab {
         padding: 5px 20px;
         border-right-width: 3px; }
@@ -2280,7 +2328,7 @@ notebook {
           border-bottom-width: 1px;
           border-top-width: 1px; }
     notebook header:backdrop {
-      background-color: #2f3434;
+      background-color: #303535;
       box-shadow: none; }
     notebook header.top tabs arrow.up, notebook header.bottom tabs arrow.up {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
@@ -2291,15 +2339,15 @@ notebook {
     notebook header.left tabs arrow.down, notebook header.right tabs arrow.down {
       -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
     notebook header tabs arrow {
-      color: #939695; }
+      color: #949796; }
       notebook header tabs arrow:hover {
-        color: #c0c2c0; }
+        color: #c1c3c1; }
       notebook header tabs arrow:active {
         color: #eeeeec; }
       notebook header tabs arrow:disabled {
-        color: rgba(147, 150, 149, 0.3); }
+        color: rgba(148, 151, 150, 0.3); }
       notebook header tabs arrow:backdrop {
-        color: rgba(147, 150, 149, 0.4); }
+        color: rgba(148, 151, 150, 0.4); }
       notebook header tabs arrow:backdrop:disabled {
         color: #5d6767; }
   notebook tab {
@@ -2328,7 +2376,7 @@ notebook {
         .top notebook tab.reorderable-page:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .top notebook tab.reorderable-page:active:backdrop {
-          border-color: #1e2222;
+          border-color: #1f2222;
           background-color: #393f3f;
           border-bottom-color: #215d9c; }
       .top notebook tab.reorderable-page:backdrop {
@@ -2347,7 +2395,7 @@ notebook {
         .bottom notebook tab.reorderable-page:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .bottom notebook tab.reorderable-page:active:backdrop {
-          border-color: #1e2222;
+          border-color: #1f2222;
           background-color: #393f3f;
           border-top-color: #215d9c; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -2366,7 +2414,7 @@ notebook {
         .left notebook tab.reorderable-page:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .left notebook tab.reorderable-page:active:backdrop {
-          border-color: #1e2222;
+          border-color: #1f2222;
           background-color: #393f3f;
           border-right-color: #215d9c; }
       .left notebook tab.reorderable-page:backdrop {
@@ -2385,7 +2433,7 @@ notebook {
         .right notebook tab.reorderable-page:active:hover {
           background-color: rgba(57, 63, 63, 0.7); }
         .right notebook tab.reorderable-page:active:backdrop {
-          border-color: #1e2222;
+          border-color: #1f2222;
           background-color: #393f3f;
           border-left-color: #215d9c; }
       .right notebook tab.reorderable-page:backdrop {
@@ -2394,17 +2442,17 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: #939695; }
+      color: #949796; }
       notebook tab label:backdrop {
-        color: #787e7e; }
+        color: #797f7f; }
     notebook tab:hover label {
-      color: #c0c2c0; }
+      color: #c1c3c1; }
       notebook tab:hover label:backdrop {
-        color: #787e7e; }
+        color: #797f7f; }
     notebook tab:active label {
       color: #eeeeec; }
       notebook tab:active label:backdrop {
-        color: #939695; }
+        color: #949796; }
     notebook tab button.flat, notebook tab button.sidebar-button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton,
     notebook tab .titlebar button.titlebutton,
     .titlebar notebook tab button.titlebutton {
@@ -2447,7 +2495,7 @@ notebook {
       notebook tab button.flat:backdrop, notebook tab button.sidebar-button:backdrop, notebook tab headerbar button.titlebutton:backdrop, headerbar notebook tab button.titlebutton:backdrop,
       notebook tab .titlebar button.titlebutton:backdrop,
       .titlebar notebook tab button.titlebutton:backdrop {
-        color: rgba(147, 150, 149, 0.3);
+        color: rgba(148, 151, 150, 0.3);
         border-color: transparent; }
 
 /**************
@@ -2489,15 +2537,15 @@ scrollbar trough {
   border: 1px none #1c1f1f; }
   scrollbar trough:backdrop {
     background-color: #323737;
-    border-color: #1e2222; }
+    border-color: #1f2222; }
 scrollbar slider {
-  background-color: #a5a8a6; }
+  background-color: #a6a8a7; }
   scrollbar slider:hover {
-    background-color: #c9cbc9; }
+    background-color: #cacbc9; }
   scrollbar slider:hover:active {
     background-color: #2a76c6; }
   scrollbar slider:backdrop {
-    background-color: #5d6161; }
+    background-color: #5d6262; }
   scrollbar slider:disabled {
     background-color: transparent; }
 scrollbar slider {
@@ -2548,16 +2596,16 @@ switch {
     box-shadow: 0 1px rgba(238, 238, 236, 0);
     text-shadow: 0 1px rgba(15, 43, 72, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:disabled {
-    color: #939695;
+    color: #949796;
     border-color: #1c1f1f;
     background-image: none;
-    background-color: #323636;
+    background-color: #333636;
     box-shadow: 0 1px rgba(238, 238, 236, 0);
     text-shadow: none; }
   switch:backdrop {
-    color: #939695;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #2f3434);
+    color: #949796;
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #303535);
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
@@ -2566,9 +2614,9 @@ switch {
       box-shadow: none; }
   switch:disabled {
     color: #5d6767;
-    border-color: #1e2222;
+    border-color: #1f2222;
     background-image: none;
-    background-color: #323636; }
+    background-color: #333636; }
   switch slider {
     margin: -1px;
     min-width: 45px;
@@ -2582,7 +2630,7 @@ switch {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(238, 238, 236, 0);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2a2f2f; }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2b2f2f; }
   switch:hover slider {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -2597,21 +2645,21 @@ switch {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(238, 238, 236, 0);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2a2f2f; }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px #2b2f2f; }
   switch:active slider {
     border: 1px solid #0f2b48; }
   switch:disabled slider {
-    color: #939695;
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     switch:disabled slider > .label {
       color: inherit; }
   switch:backdrop slider {
-    color: #939695;
-    border-color: #1e2222;
+    color: #949796;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2621,8 +2669,8 @@ switch {
     border-color: #0f2b48; }
   switch:backdrop:disabled slider {
     color: #5d6767;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #323636);
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
@@ -2778,7 +2826,7 @@ check:backdrop:checked:disabled {
     -gtk-icon-shadow: none; }
 
 menu menuitem check {
-  color: #b7b9b8;
+  color: #b8bab8;
   -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
   -gtk-icon-shadow: none; }
   menu menuitem check:hover, menu menuitem check:disabled {
@@ -2793,7 +2841,7 @@ menu menuitem check {
   menu menuitem check:hover {
     color: #ffffff; }
   menu menuitem check:disabled {
-    color: #666a6a; }
+    color: #676b6b; }
 
 radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png"));
@@ -2940,7 +2988,7 @@ radio:backdrop:checked:disabled {
     -gtk-icon-shadow: none; }
 
 menu menuitem radio {
-  color: #b7b9b8;
+  color: #b8bab8;
   -gtk-icon-source: -gtk-icontheme("radio-symbolic");
   -gtk-icon-shadow: none; }
   menu menuitem radio:hover, menu menuitem radio:disabled {
@@ -2955,52 +3003,52 @@ menu menuitem radio {
   menu menuitem radio:hover {
     color: #ffffff; }
   menu menuitem radio:disabled {
-    color: #666a6a; }
+    color: #676b6b; }
 
-.view.check, .view.radio,
+.view.check, textview text.check, iconview.check, .view.radio, textview text.radio, iconview.radio,
 row .check, row .radio {
   -gtk-icon-shadow: none; }
-  .view.check:selected, .view.check:hover, .view.radio:selected, .view.radio:hover,
+  .view.check:selected, textview text.check:selected, iconview.check:selected, .view.check:hover, textview text.check:hover, iconview.check:hover, .view.radio:selected, textview text.radio:selected, iconview.radio:selected, .view.radio:hover, textview text.radio:hover, iconview.radio:hover,
   row .check:selected,
   row .check:hover, row .radio:selected, row .radio:hover {
     -gtk-icon-shadow: none; }
 
-.view.content-view.check:not(list) {
+.view.content-view.check:not(list), textview text.content-view.check:not(list), iconview.content-view.check:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:hover:not(list) {
+.view.content-view.check:hover:not(list), textview text.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-hover-selectionmode.png"), url("assets/checkbox-hover-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:active:not(list) {
+.view.content-view.check:active:not(list), textview text.content-view.check:active:not(list), iconview.content-view.check:active:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-active-selectionmode.png"), url("assets/checkbox-active-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:backdrop:not(list) {
+.view.content-view.check:backdrop:not(list), textview text.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-backdrop-selectionmode.png"), url("assets/checkbox-backdrop-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked:not(list) {
+.view.content-view.check:checked:not(list), textview text.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode.png"), url("assets/checkbox-checked-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked:hover:not(list) {
+.view.content-view.check:checked:hover:not(list), textview text.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-selectionmode.png"), url("assets/checkbox-checked-hover-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked:active:not(list) {
+.view.content-view.check:checked:active:not(list), textview text.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-selectionmode.png"), url("assets/checkbox-checked-active-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:backdrop:checked:not(list) {
+.view.content-view.check:backdrop:checked:not(list), textview text.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-selectionmode.png"), url("assets/checkbox-checked-backdrop-selectionmode@2.png"));
   background-color: transparent; }
@@ -3009,7 +3057,7 @@ checkbutton.text-button, radiobutton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   checkbutton.text-button:disabled, checkbutton.text-button:disabled:active, checkbutton.text-button:disabled:indeterminate, radiobutton.text-button:disabled, radiobutton.text-button:disabled:active, radiobutton.text-button:disabled:indeterminate {
-    color: #939695; }
+    color: #949796; }
     checkbutton.text-button:disabled:backdrop, checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop {
       color: #5d6767; }
 
@@ -3028,17 +3076,17 @@ checkbutton check {
 scale trough, scale fill, progressbar trough {
   border: 1px solid #1c1f1f;
   border-radius: 3px;
-  background-color: #2e3333;
+  background-color: #2f3434;
   box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0); }
   scale trough:disabled, scale fill:disabled, progressbar trough:disabled {
-    background-color: #323636;
+    background-color: #333636;
     box-shadow: 0 1px rgba(238, 238, 236, 0); }
   scale trough:backdrop, scale fill:backdrop, progressbar trough:backdrop, progressbar:backdrop trough {
-    background-color: #2f3434;
-    border-color: #1e2222;
+    background-color: #303535;
+    border-color: #1f2222;
     box-shadow: none; }
     scale trough:backdrop:disabled, scale fill:backdrop:disabled, progressbar trough:backdrop:disabled, progressbar:backdrop trough:disabled {
-      background-color: #323636; }
+      background-color: #333636; }
   row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough {
     box-shadow: none; }
     row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough, row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled {
@@ -3049,7 +3097,7 @@ scale trough, scale fill, progressbar trough {
     box-shadow: none;
     outline-color: rgba(238, 238, 236, 0.2); }
     .osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled {
-      background-color: rgba(52, 57, 57, 0.5); }
+      background-color: rgba(53, 57, 58, 0.5); }
 
 scale highlight, progressbar progress {
   border: 1px solid #0f2b48;
@@ -3127,25 +3175,25 @@ scale {
     scale slider:active {
       border-color: #0f2b48; }
     scale slider:disabled {
-      color: #939695;
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       scale slider:disabled > .label {
         color: inherit; }
     scale slider:backdrop {
-      color: #939695;
-      border-color: #1e2222;
+      color: #949796;
+      border-color: #1f2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
       scale slider:backdrop:disabled {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -3183,9 +3231,9 @@ scale {
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd scale slider:disabled {
-        color: #878989;
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -3479,15 +3527,15 @@ levelbar {
     padding: 2px;
     border-radius: 3px;
     background-color: #292929;
-    background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
+    background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
     color: white;
     border-color: #1c1f1f;
     box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0); }
     levelbar trough:backdrop {
       background-color: #292929;
-      background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%);
-      color: #d4d4d4;
-      border-color: #1e2222;
+      background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
+      color: #d5d5d5;
+      border-color: #1f2222;
       background-image: linear-gradient(to bottom, #2c2c2c);
       box-shadow: 0 1px rgba(238, 238, 236, 0); }
   levelbar.horizontal.discrete block {
@@ -3524,7 +3572,7 @@ levelbar {
     border-color: rgba(238, 238, 236, 0.1);
     box-shadow: none; }
     levelbar block.empty:backdrop {
-      border-color: rgba(147, 150, 149, 0.15); }
+      border-color: rgba(148, 151, 150, 0.15); }
 
 /**********
  * Frames *
@@ -3541,14 +3589,14 @@ frame border,
     border-style: none; }
   frame border:backdrop,
   .frame:backdrop {
-    border-color: #1e2222; }
+    border-color: #1f2222; }
 
 paper {
   border: 1px solid #1c1f1f;
   background: white;
   padding: 0; }
   paper:backdrop {
-    border-color: #1e2222; }
+    border-color: #1f2222; }
 
 actionbar box {
   padding: 6px;
@@ -3568,7 +3616,7 @@ scrolledwindow overshoot.top {
   box-shadow: none; }
   placessidebar overshoot.top:backdrop,
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -3586,7 +3634,7 @@ scrolledwindow overshoot.bottom {
   box-shadow: none; }
   placessidebar overshoot.bottom:backdrop,
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -3604,7 +3652,7 @@ scrolledwindow overshoot.left {
   box-shadow: none; }
   placessidebar overshoot.left:backdrop,
   scrolledwindow overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -3622,7 +3670,7 @@ scrolledwindow overshoot.right {
   box-shadow: none; }
   placessidebar overshoot.right:backdrop,
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1e2222), to(rgba(30, 34, 34, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1f2222), to(rgba(31, 34, 34, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -3683,7 +3731,7 @@ scrolledwindow junction {
     border-image-slice: 0 1 0 0; }
   placessidebar junction:backdrop,
   scrolledwindow junction:backdrop {
-    border-image-source: linear-gradient(to bottom, #1e2222 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, #1f2222 1px, transparent 1px);
     background-color: #323737; }
 
 separator {
@@ -3699,7 +3747,7 @@ list {
   border-color: #1c1f1f; }
   list:backdrop {
     background-color: #2c2c2c;
-    border-color: #1e2222; }
+    border-color: #1f2222; }
   list row {
     padding: 2px; }
 
@@ -3712,7 +3760,7 @@ row.activatable:backdrop:hover {
 row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 row.activatable:selected.has-open-popup, row.activatable:selected:hover {
-  background-color: #356ba4; }
+  background-color: #366ca4; }
 row.activatable:selected:backdrop {
   background-color: #215d9c; }
 
@@ -3761,8 +3809,8 @@ row:selected .titlebar button.titlebutton,
   row:selected button:backdrop, row:selected button.flat:backdrop, row:selected button.sidebar-button:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop,
   row:selected .titlebar button.titlebutton:backdrop,
   .titlebar row:selected button.titlebutton:backdrop {
-    color: #939695;
-    border-color: #1e2222;
+    color: #949796;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -3772,20 +3820,21 @@ row:selected .titlebar button.titlebutton,
     .titlebar row:selected button.titlebutton:backdrop:active, row:selected button.flat:backdrop:checked, row:selected button.sidebar-button:backdrop:checked, row:selected headerbar button.titlebutton:backdrop:checked, headerbar row:selected button.titlebutton:backdrop:checked,
     row:selected .titlebar button.titlebutton:backdrop:checked,
     .titlebar row:selected button.titlebutton:backdrop:checked {
-      color: #939695;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #2f3434);
+      color: #949796;
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #303535);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     row:selected button:backdrop:disabled, row:selected button.flat:backdrop:disabled, row:selected button.sidebar-button:backdrop:disabled, row:selected headerbar button.titlebutton:backdrop:disabled, headerbar row:selected button.titlebutton:backdrop:disabled,
     row:selected .titlebar button.titlebutton:backdrop:disabled,
     .titlebar row:selected button.titlebutton:backdrop:disabled {
       color: #5d6767;
-      border-color: #1e2222;
-      background-image: linear-gradient(to bottom, #323636);
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      row:selected button:backdrop:disabled > .label, row:selected button.flat:backdrop:disabled > .label, row:selected button.sidebar-button:backdrop:disabled > .label, row:selected headerbar button.titlebutton:backdrop:disabled > .label, headerbar row:selected button.titlebutton:backdrop:disabled > .label,
+      row:selected button:backdrop:disabled > .label, row:selected headerbar button.titlebutton:backdrop:disabled > .label,
+      row:selected .titlebar button.titlebutton:backdrop:disabled > .label, row:selected button.flat:backdrop:disabled > .label, row:selected button.sidebar-button:backdrop:disabled > .label, row:selected headerbar button.titlebutton:backdrop:disabled > .label, headerbar row:selected button.titlebutton:backdrop:disabled > .label,
       row:selected .titlebar button.titlebutton:backdrop:disabled > .label,
       .titlebar row:selected button.titlebutton:backdrop:disabled > .label {
         color: inherit; }
@@ -3795,10 +3844,12 @@ row:selected .titlebar button.titlebutton,
       row:selected .titlebar button.titlebutton:backdrop:disabled:checked,
       .titlebar row:selected button.titlebutton:backdrop:disabled:checked {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #262929);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #272929);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        row:selected button:backdrop:disabled:active > .label, row:selected button:backdrop:disabled:checked > .label, row:selected button.flat:backdrop:disabled:active > .label, row:selected button.sidebar-button:backdrop:disabled:active > .label, row:selected headerbar button.titlebutton:backdrop:disabled:active > .label, headerbar row:selected button.titlebutton:backdrop:disabled:active > .label,
+        row:selected button:backdrop:disabled:active > .label, row:selected headerbar button.titlebutton:backdrop:disabled:active > .label,
+        row:selected .titlebar button.titlebutton:backdrop:disabled:active > .label, row:selected button:backdrop:disabled:checked > .label, row:selected headerbar button.titlebutton:backdrop:disabled:checked > .label,
+        row:selected .titlebar button.titlebutton:backdrop:disabled:checked > .label, row:selected button.flat:backdrop:disabled:active > .label, row:selected button.sidebar-button:backdrop:disabled:active > .label, row:selected headerbar button.titlebutton:backdrop:disabled:active > .label, headerbar row:selected button.titlebutton:backdrop:disabled:active > .label,
         row:selected .titlebar button.titlebutton:backdrop:disabled:active > .label,
         .titlebar row:selected button.titlebutton:backdrop:disabled:active > .label, row:selected button.flat:backdrop:disabled:checked > .label, row:selected button.sidebar-button:backdrop:disabled:checked > .label, row:selected headerbar button.titlebutton:backdrop:disabled:checked > .label, headerbar row:selected button.titlebutton:backdrop:disabled:checked > .label,
         row:selected .titlebar button.titlebutton:backdrop:disabled:checked > .label,
@@ -3813,22 +3864,25 @@ row:selected .titlebar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #939695; }
+    color: #949796; }
   row:selected button:disabled {
-    color: #939695;
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    row:selected button:disabled > .label {
+    row:selected button:disabled > .label, row:selected headerbar button.titlebutton:disabled > .label,
+    row:selected .titlebar button.titlebutton:disabled > .label {
       color: inherit; }
     row:selected button:disabled:active, row:selected button:disabled:checked {
-      color: #939695;
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #2f3333, #323636);
+      background-image: linear-gradient(to bottom, #313434, #333636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      row:selected button:disabled:active > .label, row:selected button:disabled:checked > .label {
+      row:selected button:disabled:active > .label, row:selected headerbar button.titlebutton:disabled:active > .label,
+      row:selected .titlebar button.titlebutton:disabled:active > .label, row:selected button:disabled:checked > .label, row:selected headerbar button.titlebutton:disabled:checked > .label,
+      row:selected .titlebar button.titlebutton:disabled:checked > .label {
         color: inherit; }
 
 row {
@@ -3885,17 +3939,17 @@ calendar {
     calendar.button:hover {
       color: #eeeeec; }
     calendar.button:backdrop {
-      color: rgba(147, 150, 149, 0.45); }
+      color: rgba(148, 151, 150, 0.45); }
     calendar.button:disabled {
-      color: rgba(147, 150, 149, 0.45); }
+      color: rgba(148, 151, 150, 0.45); }
   calendar:indeterminate, calendar:indeterminate:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
     font-size: smaller;
     color: #eeeeec; }
   calendar:backdrop {
-    color: #d4d4d4;
-    border-color: #1e2222; }
+    color: #d5d5d5;
+    border-color: #1f2222; }
 
 /***********
  * Dialogs *
@@ -3944,29 +3998,31 @@ messagedialog.csd .dialog-action-area button {
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
   messagedialog.csd .dialog-action-area button:disabled {
-    color: #939695;
+    color: #949796;
     border-color: #1c1f1f;
-    background-image: linear-gradient(to bottom, #323636);
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:disabled > .label {
+    messagedialog.csd .dialog-action-area button:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.titlebutton:disabled > .label,
+    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:disabled > .label {
       color: inherit; }
   messagedialog.csd .dialog-action-area button:backdrop {
-    color: #939695;
-    border-color: #1e2222;
+    color: #949796;
+    border-color: #1f2222;
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   messagedialog.csd .dialog-action-area button:backdrop:disabled {
     color: #5d6767;
-    border-color: #1e2222;
-    background-image: linear-gradient(to bottom, #323636);
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:backdrop:disabled > .label {
+    messagedialog.csd .dialog-action-area button:backdrop:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.titlebutton:backdrop:disabled > .label,
+    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:backdrop:disabled > .label {
       color: inherit; }
   messagedialog.csd .dialog-action-area button.suggested-action {
     color: white;
@@ -3999,7 +4055,7 @@ messagedialog.csd .dialog-action-area button {
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353);
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
     messagedialog.csd .dialog-action-area button.suggested-action:backdrop {
-      color: #d2deeb;
+      color: #d3dfeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -4007,21 +4063,23 @@ messagedialog.csd .dialog-action-area button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled > .label {
+        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
+        messagedialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.suggested-action:disabled {
-      color: #939695;
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.suggested-action:disabled > .label {
+      messagedialog.csd .dialog-action-area button.suggested-action:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:disabled > .label,
+      messagedialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:disabled > .label {
         color: inherit; }
   messagedialog.csd .dialog-action-area button.destructive-action {
     color: white;
@@ -4054,7 +4112,7 @@ messagedialog.csd .dialog-action-area button {
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.72078);
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
     messagedialog.csd .dialog-action-area button.destructive-action:backdrop {
-      color: #f6cfcf;
+      color: #f7cfcf;
       border-color: #5e0707;
       background-image: linear-gradient(to bottom, #d51010);
       text-shadow: none;
@@ -4062,21 +4120,23 @@ messagedialog.csd .dialog-action-area button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled {
         color: #5d6767;
-        border-color: #1e2222;
-        background-image: linear-gradient(to bottom, #323636);
+        border-color: #1f2222;
+        background-image: linear-gradient(to bottom, #333636);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled > .label {
+        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
+        messagedialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:backdrop:disabled > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.destructive-action:disabled {
-      color: #939695;
+      color: #949796;
       border-color: #1c1f1f;
-      background-image: linear-gradient(to bottom, #323636);
+      background-image: linear-gradient(to bottom, #333636);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.destructive-action:disabled > .label {
+      messagedialog.csd .dialog-action-area button.destructive-action:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:disabled > .label,
+      messagedialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:disabled > .label {
         color: inherit; }
 messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-area button:hover, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:disabled, messagedialog.csd .dialog-action-area button:backdrop, messagedialog.csd .dialog-action-area button:backdrop:disabled, messagedialog.csd .dialog-action-area button.suggested-action, messagedialog.csd .dialog-action-area button.suggested-action:hover, messagedialog.csd .dialog-action-area button.suggested-action:active, messagedialog.csd .dialog-action-area button.suggested-action:backdrop, messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled, messagedialog.csd .dialog-action-area button.suggested-action:disabled, messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.destructive-action:hover, messagedialog.csd .dialog-action-area button.destructive-action:active, messagedialog.csd .dialog-action-area button.destructive-action:backdrop, messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled, messagedialog.csd .dialog-action-area button.destructive-action:disabled {
   border-left-style: solid;
@@ -4093,7 +4153,7 @@ messagedialog.csd .dialog-action-area button:first-child {
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #1c1f1f; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #1e2222; }
+    border-top-color: #1f2222; }
 
 /***********
  * Sidebar *
@@ -4102,7 +4162,7 @@ GtkFileChooserDialog .dialog-action-box {
   border: none;
   background-color: #313434; }
   .sidebar:backdrop {
-    background-color: #323535; }
+    background-color: #333636; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -4134,7 +4194,9 @@ placessidebar row {
     padding: 5px;
     border-radius: 100%;
     -gtk-outline-radius: 100%; }
-    button.sidebar-button:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image {
+    button.sidebar-button:not(:hover):not(:active) > image, headerbar button.sidebar-button.titlebutton:not(:hover):not(:active) > image,
+    .titlebar button.sidebar-button.titlebutton:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image, headerbar button.sidebar-button.titlebutton:backdrop > image,
+    .titlebar button.sidebar-button.titlebutton:backdrop > image {
       opacity: 0.7; }
 placessidebar row:selected:active {
   box-shadow: none; }
@@ -4166,7 +4228,7 @@ paned > separator {
   paned > separator:selected {
     background-image: linear-gradient(to top, #215d9c); }
   paned > separator:backdrop {
-    background-image: linear-gradient(to top, #1e2222); }
+    background-image: linear-gradient(to top, #1f2222); }
   paned > separator.wide {
     margin: 0;
     padding: 0;
@@ -4175,7 +4237,7 @@ paned > separator {
     background-image: linear-gradient(to top, #1c1f1f), linear-gradient(to top, #1c1f1f);
     background-size: 1px 1px, 1px 1px; }
     paned > separator.wide:backdrop {
-      background-image: linear-gradient(to top, #1e2222), linear-gradient(to top, #1e2222); }
+      background-image: linear-gradient(to top, #1f2222), linear-gradient(to top, #1f2222); }
 paned.horizontal > separator {
   background-repeat: repeat-y; }
   paned.horizontal > separator:dir(ltr) {
@@ -4272,22 +4334,29 @@ infobar {
     .question button:disabled,
     .warning button:disabled,
     .error button:disabled {
-      color: #90aac4;
+      color: #91aac5;
       border-color: #0b1e33;
-      background-image: linear-gradient(to bottom, #22558a);
+      background-image: linear-gradient(to bottom, #22558b);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info button:disabled > .label,
+      .info button:disabled > .label, .info headerbar button.titlebutton:disabled > .label,
+      .info .titlebar button.titlebutton:disabled > .label,
       .question button:disabled > .label,
+      .question headerbar button.titlebutton:disabled > .label,
+      .question .titlebar button.titlebutton:disabled > .label,
       .warning button:disabled > .label,
-      .error button:disabled > .label {
+      .warning headerbar button.titlebutton:disabled > .label,
+      .warning .titlebar button.titlebutton:disabled > .label,
+      .error button:disabled > .label,
+      .error headerbar button.titlebutton:disabled > .label,
+      .error .titlebar button.titlebutton:disabled > .label {
         color: inherit; }
     .info button:backdrop,
     .question button:backdrop,
     .warning button:backdrop,
     .error button:backdrop {
-      color: #d2deeb;
+      color: #d3dfeb;
       border-color: #0b1e33;
       background-image: linear-gradient(to bottom, #215d9c);
       text-shadow: none;
@@ -4298,17 +4367,24 @@ infobar {
       .question button:backdrop:disabled,
       .warning button:backdrop:disabled,
       .error button:backdrop:disabled {
-        color: #6f90b2;
+        color: #6f91b4;
         border-color: #0b1e33;
-        background-image: linear-gradient(to bottom, #22558a);
+        background-image: linear-gradient(to bottom, #22558b);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #0b1e33; }
-        .info button:backdrop:disabled > .label,
+        .info button:backdrop:disabled > .label, .info headerbar button.titlebutton:backdrop:disabled > .label,
+        .info .titlebar button.titlebutton:backdrop:disabled > .label,
         .question button:backdrop:disabled > .label,
+        .question headerbar button.titlebutton:backdrop:disabled > .label,
+        .question .titlebar button.titlebutton:backdrop:disabled > .label,
         .warning button:backdrop:disabled > .label,
-        .error button:backdrop:disabled > .label {
+        .warning headerbar button.titlebutton:backdrop:disabled > .label,
+        .warning .titlebar button.titlebutton:backdrop:disabled > .label,
+        .error button:backdrop:disabled > .label,
+        .error headerbar button.titlebutton:backdrop:disabled > .label,
+        .error .titlebar button.titlebutton:backdrop:disabled > .label {
           color: inherit; }
   .info label:selected, .info label:selected:focus, .info label:selected:hover,
   .question label:selected,
@@ -4382,7 +4458,7 @@ colorswatch.light overlay {
   colorswatch.light overlay:hover {
     border-color: #1c1f1f; }
   colorswatch.light overlay:backdrop {
-    color: #d4d4d4; }
+    color: #d5d5d5; }
 colorswatch overlay {
   box-shadow: inset 0 3px 2px -2px rgba(0, 0, 0, 0.5);
   border: 1px solid #1c1f1f; }
@@ -4418,8 +4494,8 @@ colorswatch#add-color-button {
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(238, 238, 236, 0); }
     colorswatch#add-color-button overlay:backdrop {
-      color: #939695;
-      border-color: #1e2222;
+      color: #949796;
+      border-color: #1f2222;
       background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       -gtk-icon-shadow: none;
@@ -4489,7 +4565,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #393f3f;
-    border: solid 1px #1e2222;
+    border: solid 1px #1f2222;
     box-shadow: none; }
 
 headerbar button.titlebutton,
@@ -4510,33 +4586,28 @@ headerbar.selection-mode button.titlebutton,
   .titlebar.selection-mode button.titlebutton:backdrop {
     -gtk-icon-shadow: none; }
 
-textview text selection,
-textview text selection:focus,
-.view selection,
-.view selection:focus, iconview:selected, iconview:selected:focus, flowbox flowboxchild:selected, label:selected,
+.view:selected, textview text:selected, iconview:selected, .view:selected:focus, textview text:selected:focus, iconview:selected:focus, textview text selection,
+textview text selection:focus, flowbox flowboxchild:selected, label:selected,
 label selection,
 label selection:focus,
 label selection:hover, entry selection, spinbutton selection,
 entry selection:focus,
 spinbutton selection:focus, modelbutton.flat:selected,
-.menuitem.button.flat:selected, treeview.view:selected, row:selected, calendar:selected, .sidebar :selected {
+.menuitem.button.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, calendar:selected, .sidebar :selected {
   background-color: #215d9c;
   color: #ffffff; }
-  textview text selection:disabled,
-  .view selection:disabled, iconview:disabled:selected, flowbox flowboxchild:disabled:selected, label:disabled:selected,
+  .view:disabled:selected, textview text:disabled:selected, iconview:disabled:selected, textview text:disabled:selected:focus, iconview:disabled:selected:focus, textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled:selected,
   label selection:disabled, entry selection:disabled, spinbutton selection:disabled, modelbutton.flat:disabled:selected,
-  .menuitem.button.flat:disabled:selected, treeview.view:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label {
-    color: #90aecd; }
-  textview text selection:backdrop,
-  .view selection:backdrop, iconview:backdrop:selected, flowbox flowboxchild:backdrop:selected, label:backdrop:selected,
+  .menuitem.button.flat:disabled:selected, treeview.view:disabled:selected:focus, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label {
+    color: #90aece; }
+  .view:backdrop:selected, textview text:backdrop:selected, iconview:backdrop:selected, textview text:backdrop:selected:focus, iconview:backdrop:selected:focus, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label:backdrop:selected,
   label selection:backdrop, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected,
-  .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, .sidebar :backdrop:selected {
+  .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected:focus, row:backdrop:selected, calendar:backdrop:selected, .sidebar :backdrop:selected {
     color: #ffffff; }
-    textview text selection:backdrop:disabled,
-    .view selection:backdrop:disabled, iconview:backdrop:disabled:selected, flowbox flowboxchild:backdrop:disabled:selected, label:backdrop:disabled:selected,
+    .view:backdrop:disabled:selected, textview text:backdrop:disabled:selected, iconview:backdrop:disabled:selected, textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, label:backdrop:disabled:selected,
     label selection:backdrop:disabled, entry selection:backdrop:disabled, spinbutton selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected,
-    .menuitem.button.flat:backdrop:disabled:selected, treeview.view:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected, placessidebar row:selected:disabled label:backdrop, placessidebar row:selected:backdrop:disabled label {
-      color: #638db9; }
+    .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected, placessidebar row:selected:disabled label:backdrop, placessidebar row:selected:backdrop:disabled label {
+      color: #648eba; }
 
 .monospace {
   font: Monospace; }
@@ -4600,7 +4671,7 @@ button.circular, headerbar button.circular.titlebutton,
   font-size: smaller; }
   .keycap:backdrop {
     background-color: #2c2c2c;
-    color: #939695; }
+    color: #949796; }
   .keycap border {
     border-style: none; }
 
@@ -4644,16 +4715,16 @@ text/foreground color of selections */
 @define-color theme_selected_fg_color #ffffff;
 /*
 base background color of insensitive widgets */
-@define-color insensitive_bg_color #323636;
+@define-color insensitive_bg_color #333636;
 /*
 text foreground color of insensitive widgets */
-@define-color insensitive_fg_color #939695;
+@define-color insensitive_fg_color #949796;
 /*
 insensitive text widgets and the like base background color */
 @define-color insensitive_base_color #292929;
 /*
 widget text/foreground color on backdrop windows */
-@define-color theme_unfocused_fg_color #939695;
+@define-color theme_unfocused_fg_color #949796;
 /*
 text color for entries, views and content in general on backdrop windows */
 @define-color theme_unfocused_text_color white;
@@ -4674,7 +4745,7 @@ widgets main borders color */
 @define-color borders #1c1f1f;
 /*
 widgets main borders color on backdrop windows */
-@define-color unfocused_borders #1e2222;
+@define-color unfocused_borders #1f2222;
 /*
 these are pretty self explicative */
 @define-color warning_color #f57900;
@@ -4684,7 +4755,7 @@ these are pretty self explicative */
 these colors are exported for the window manager and shouldn't be used in applications,
 read if you used those and something break with a version upgrade you're on your own... */
 @define-color wm_title shade(#eeeeec, 1.8);
-@define-color wm_unfocused_title #939695;
+@define-color wm_unfocused_title #949796;
 @define-color wm_highlight transparent;
 @define-color wm_borders_edge rgba(238, 238, 236, 0.07);
 @define-color wm_bg_a shade(#393f3f, 1.2);

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index f1f6e627fba696c1f8b5d9a6f9923f61d6157a9f..55796bd0d2cab40dab562b35b44ed7ae56e147cf 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -25,7 +25,7 @@
   .background:backdrop {
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #8b8e8e;
+    color: #8b8e8f;
     background-color: #e8e8e7; }
 
 /*
@@ -47,28 +47,19 @@
     background-color: #cfcfcd;
     color: #2e3436; }
   .gtkstyle-fallback:disabled {
-    background-color: #f1f1f0;
-    color: #8b8e8e; }
+    background-color: #f1f1f1;
+    color: #8b8e8f; }
   .gtkstyle-fallback:selected {
     background-color: #4a90d9;
     color: #ffffff; }
 
-textview text,
-.view {
+.view, textview text, iconview {
   color: black;
   background-color: #ffffff; }
-  textview text:backdrop,
-  .view:backdrop {
-    color: #323232;
+  .view:backdrop, textview text:backdrop, iconview:backdrop {
+    color: #333333;
     background-color: white; }
-
-iconview {
-  color: black;
-  background-color: #ffffff; }
-  iconview:backdrop {
-    color: #323232;
-    background-color: white; }
-  iconview:selected, iconview:selected:focus {
+  .view:selected, textview text:selected, iconview:selected, .view:selected:focus, textview text:selected:focus, iconview:selected:focus {
     border-radius: 3px; }
 
 .rubberband,
@@ -88,9 +79,9 @@ flowbox flowboxchild {
 label.separator {
   color: #2e3436; }
   label.separator:backdrop {
-    color: #8b8e8e; }
+    color: #8b8e8f; }
 label:disabled {
-  color: #8b8e8e; }
+  color: #8b8e8f; }
   label:disabled:backdrop {
     color: #c3c3c0; }
 
@@ -108,18 +99,18 @@ assistant .sidebar {
     border-left: 1px solid #9d9d99; }
   assistant .sidebar:backdrop {
     background-color: white;
-    border-color: #a4a4a0; }
+    border-color: #a5a5a1; }
 assistant.csd .sidebar {
   border-top-style: none; }
 assistant .sidebar label {
   padding: 6px 12px; }
 assistant .sidebar label.highlight {
-  background-color: #c2c4c3; }
+  background-color: #c3c4c4; }
 
 textview {
-  background-color: #f3f3f3; }
+  background-color: #f4f4f3; }
   textview:backdrop {
-    background-color: #f3f3f3; }
+    background-color: #f4f4f3; }
 
 popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.osd, .csd popover.background.osd, .app-notification,
 .app-notification.frame, .osd .scale-popup, .osd {
@@ -161,7 +152,7 @@ entry, spinbutton {
   border-radius: 3px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   background-color: #ffffff;
-  background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+  background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
   color: black;
   border-color: #9d9d99;
   box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -174,7 +165,7 @@ entry, spinbutton {
   entry.flat, spinbutton.flat, entry.flat:focus, spinbutton.flat:focus {
     padding: 2px;
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
     color: black;
     border-color: #9d9d99;
     box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0);
@@ -182,29 +173,29 @@ entry, spinbutton {
     border-radius: 0; }
   entry:focus, spinbutton:focus {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
     box-shadow: inset 0 0 0 1px #4a90d9, 0 1px rgba(255, 255, 255, 0);
     border-color: #4a90d9; }
   entry:disabled, spinbutton:disabled {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
-    color: #8b8e8e;
+    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+    color: #8b8e8f;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f0);
+    background-image: linear-gradient(to bottom, #f1f1f1);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry:backdrop, spinbutton:backdrop {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
-    color: #323232;
-    border-color: #a4a4a0;
+    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+    color: #333333;
+    border-color: #a5a5a1;
     background-image: linear-gradient(to bottom, white);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry:backdrop:disabled, spinbutton:backdrop:disabled {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
     color: #c3c3c0;
-    border-color: #a4a4a0;
-    background-image: linear-gradient(to bottom, #f1f1f0);
+    border-color: #a5a5a1;
+    background-image: linear-gradient(to bottom, #f1f1f1);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry progress, spinbutton progress {
     margin: 1px;
@@ -224,7 +215,7 @@ entry, spinbutton {
     border-color: #cc0000; }
     entry.error:focus, spinbutton.error:focus {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
       box-shadow: inset 0 0 0 1px #cc0000, 0 1px rgba(255, 255, 255, 0);
       border-color: #cc0000; }
     entry.error:selected, spinbutton.error:selected, entry.error:selected:focus, spinbutton.error:selected:focus {
@@ -234,22 +225,22 @@ entry, spinbutton {
     border-color: #f57900; }
     entry.warning:focus, spinbutton.warning:focus {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
       box-shadow: inset 0 0 0 1px #f57900, 0 1px rgba(255, 255, 255, 0);
       border-color: #f57900; }
     entry.warning:selected, spinbutton.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected:focus {
       background-color: #f57900; }
   entry image, spinbutton image {
-    color: #575c5e; }
+    color: #585d5e; }
     entry image:hover, spinbutton image:hover {
       color: #2e3436; }
     entry image:active, spinbutton image:active {
       color: #4a90d9; }
     entry image:backdrop, spinbutton image:backdrop {
-      color: #a2a4a4; }
+      color: #a2a5a5; }
   .osd entry, .osd spinbutton {
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -259,7 +250,7 @@ entry, spinbutton {
     -gtk-icon-shadow: 0 1px black; }
     .osd entry:focus, .osd spinbutton:focus {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
       color: white;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -269,7 +260,7 @@ entry, spinbutton {
       -gtk-icon-shadow: 0 1px black; }
     .osd entry:backdrop, .osd spinbutton:backdrop {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
@@ -279,10 +270,10 @@ entry, spinbutton {
       -gtk-icon-shadow: none; }
     .osd entry:disabled, .osd spinbutton:disabled {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
-      color: #878989;
+      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -293,13 +284,13 @@ entry, spinbutton {
 .linked.vertical > entry:focus:not(:last-child), .linked.vertical > spinbutton:focus:not(:last-child) {
   box-shadow: inset 0 0 0 1px #4a90d9; }
 .linked.vertical > entry:not(:disabled) + entry:not(:disabled), .linked.vertical > spinbutton:not(:disabled) + entry:not(:disabled), .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled), .linked.vertical > spinbutton:not(:disabled) + spinbutton:not(:disabled) {
-  border-top-color: #e1e1e0;
+  border-top-color: #e2e2e0;
   background-image: linear-gradient(to bottom, #ffffff); }
   .linked.vertical > entry:not(:disabled) + entry:not(:disabled):backdrop, .linked.vertical > spinbutton:not(:disabled) + entry:not(:disabled):backdrop, .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):backdrop, .linked.vertical > spinbutton:not(:disabled) + spinbutton:not(:disabled):backdrop {
-    border-top-color: #e3e3e2;
+    border-top-color: #e4e4e3;
     background-image: linear-gradient(to bottom, white); }
 .linked.vertical > entry:disabled + entry:disabled, .linked.vertical > spinbutton:disabled + entry:disabled, .linked.vertical > entry:disabled + spinbutton:disabled, .linked.vertical > spinbutton:disabled + spinbutton:disabled {
-  border-top-color: #e1e1e0; }
+  border-top-color: #e2e2e0; }
 .linked.vertical > entry + entry:focus:not(:last-child), .linked.vertical > spinbutton + entry:focus:not(:last-child), .linked.vertical > entry + spinbutton:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton:focus:not(:last-child) {
   border-top-color: #4a90d9;
   box-shadow: inset 0 0 0 1px #4a90d9; }
@@ -381,8 +372,8 @@ button, headerbar button.titlebutton,
   button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop, button.flat:backdrop, button.sidebar-button:backdrop, headerbar button.titlebutton:backdrop,
   .titlebar button.titlebutton:backdrop {
-    color: #8b8e8e;
-    border-color: #a4a4a0;
+    color: #8b8e8f;
+    border-color: #a5a5a1;
     background-image: linear-gradient(to bottom, #e8e8e7);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -391,29 +382,32 @@ button, headerbar button.titlebutton,
     button:backdrop:active, button:backdrop:checked, button.flat:backdrop:active, button.sidebar-button:backdrop:active, headerbar button.titlebutton:backdrop:active,
     .titlebar button.titlebutton:backdrop:active, button.flat:backdrop:checked, button.sidebar-button:backdrop:checked, headerbar button.titlebutton:backdrop:checked,
     .titlebar button.titlebutton:backdrop:checked {
-      color: #8b8e8e;
-      border-color: #a4a4a0;
-      background-image: linear-gradient(to bottom, #d0d0ce);
+      color: #8b8e8f;
+      border-color: #a5a5a1;
+      background-image: linear-gradient(to bottom, #d1d1cf);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     button:backdrop:disabled, button.flat:backdrop:disabled, button.sidebar-button:backdrop:disabled, headerbar button.titlebutton:backdrop:disabled,
     .titlebar button.titlebutton:backdrop:disabled {
       color: #c3c3c0;
-      border-color: #a4a4a0;
-      background-image: linear-gradient(to bottom, #f1f1f0);
+      border-color: #a5a5a1;
+      background-image: linear-gradient(to bottom, #f1f1f1);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button:backdrop:disabled > .label, button.flat:backdrop:disabled > .label, button.sidebar-button:backdrop:disabled > .label, headerbar button.titlebutton:backdrop:disabled > .label,
+      button:backdrop:disabled > .label, headerbar button.titlebutton:backdrop:disabled > .label,
+      .titlebar button.titlebutton:backdrop:disabled > .label, button.flat:backdrop:disabled > .label, button.sidebar-button:backdrop:disabled > .label, headerbar button.titlebutton:backdrop:disabled > .label,
       .titlebar button.titlebutton:backdrop:disabled > .label {
         color: inherit; }
     button:backdrop:disabled:active, button:backdrop:disabled:checked, button.flat:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active, headerbar button.titlebutton:backdrop:disabled:active,
     .titlebar button.titlebutton:backdrop:disabled:active, button.flat:backdrop:disabled:checked, button.sidebar-button:backdrop:disabled:checked, headerbar button.titlebutton:backdrop:disabled:checked,
     .titlebar button.titlebutton:backdrop:disabled:checked {
       color: #c3c3c0;
-      border-color: #a4a4a0;
-      background-image: linear-gradient(to bottom, #e5e5e3);
+      border-color: #a5a5a1;
+      background-image: linear-gradient(to bottom, #e4e4e4);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button:backdrop:disabled:active > .label, button:backdrop:disabled:checked > .label, button.flat:backdrop:disabled:active > .label, button.sidebar-button:backdrop:disabled:active > .label, headerbar button.titlebutton:backdrop:disabled:active > .label,
+      button:backdrop:disabled:active > .label, headerbar button.titlebutton:backdrop:disabled:active > .label,
+      .titlebar button.titlebutton:backdrop:disabled:active > .label, button:backdrop:disabled:checked > .label, headerbar button.titlebutton:backdrop:disabled:checked > .label,
+      .titlebar button.titlebutton:backdrop:disabled:checked > .label, button.flat:backdrop:disabled:active > .label, button.sidebar-button:backdrop:disabled:active > .label, headerbar button.titlebutton:backdrop:disabled:active > .label,
       .titlebar button.titlebutton:backdrop:disabled:active > .label, button.flat:backdrop:disabled:checked > .label, button.sidebar-button:backdrop:disabled:checked > .label, headerbar button.titlebutton:backdrop:disabled:checked > .label,
       .titlebar button.titlebutton:backdrop:disabled:checked > .label {
         color: inherit; }
@@ -429,20 +423,23 @@ button, headerbar button.titlebutton,
     -gtk-icon-shadow: none; }
   button:disabled, headerbar button.titlebutton:disabled,
   .titlebar button.titlebutton:disabled {
-    color: #8b8e8e;
+    color: #8b8e8f;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f0);
+    background-image: linear-gradient(to bottom, #f1f1f1);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-    button:disabled > .label {
+    button:disabled > .label, headerbar button.titlebutton:disabled > .label,
+    .titlebar button.titlebutton:disabled > .label {
       color: inherit; }
     button:disabled:active, button:disabled:checked {
-      color: #8b8e8e;
+      color: #8b8e8f;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #e8e8e7, #f1f1f0);
+      background-image: linear-gradient(to bottom, #e9e9e8, #f1f1f1);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button:disabled:active > .label, button:disabled:checked > .label {
+      button:disabled:active > .label, headerbar button.titlebutton:disabled:active > .label,
+      .titlebar button.titlebutton:disabled:active > .label, button:disabled:checked > .label, headerbar button.titlebutton:disabled:checked > .label,
+      .titlebar button.titlebutton:disabled:checked > .label {
         color: inherit; }
   button.osd, headerbar button.osd.titlebutton,
   .titlebar button.osd.titlebutton {
@@ -485,9 +482,9 @@ button, headerbar button.titlebutton,
       border: none;
       box-shadow: none; }
     button.osd:disabled, button.osd:backdrop:disabled {
-      color: #878989;
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -535,9 +532,9 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       outline-color: rgba(238, 238, 236, 0.3); }
     popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, popover.background.touch-selection button:backdrop:disabled, popover.background.magnifier button:backdrop:disabled, .app-notification button:backdrop:disabled, .osd button:disabled, .osd button:backdrop:disabled {
-      color: #878989;
+      color: #878a89;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -594,9 +591,9 @@ button, headerbar button.titlebutton,
       .titlebar .app-notification button.titlebutton:disabled, .osd button.flat:disabled, .osd button.sidebar-button:disabled, .osd headerbar button.titlebutton:disabled, headerbar .osd button.titlebutton:disabled,
       .osd .titlebar button.titlebutton:disabled,
       .titlebar .osd button.titlebutton:disabled {
-        color: #878989;
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -686,7 +683,7 @@ button, headerbar button.titlebutton,
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(255, 255, 255, 0); }
     button.suggested-action:backdrop, button.suggested-action.flat:backdrop, button.suggested-action.sidebar-button:backdrop, headerbar button.suggested-action.titlebutton:backdrop,
     .titlebar button.suggested-action.titlebutton:backdrop {
-      color: #dae8f7;
+      color: #dbe9f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -695,29 +692,32 @@ button, headerbar button.titlebutton,
       button.suggested-action:backdrop:active, button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, button.suggested-action.sidebar-button:backdrop:active, headerbar button.suggested-action.titlebutton:backdrop:active,
       .titlebar button.suggested-action.titlebutton:backdrop:active, button.suggested-action.flat:backdrop:checked, button.suggested-action.sidebar-button:backdrop:checked, headerbar button.suggested-action.titlebutton:backdrop:checked,
       .titlebar button.suggested-action.titlebutton:backdrop:checked {
-        color: #d4e3f3;
+        color: #d4e4f4;
         border-color: #2a76c6;
         background-image: linear-gradient(to bottom, #2a76c6);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       button.suggested-action:backdrop:disabled, button.suggested-action.flat:backdrop:disabled, button.suggested-action.sidebar-button:backdrop:disabled, headerbar button.suggested-action.titlebutton:backdrop:disabled,
       .titlebar button.suggested-action.titlebutton:backdrop:disabled {
         color: #c3c3c0;
-        border-color: #a4a4a0;
-        background-image: linear-gradient(to bottom, #f1f1f0);
+        border-color: #a5a5a1;
+        background-image: linear-gradient(to bottom, #f1f1f1);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-        button.suggested-action:backdrop:disabled > .label, button.suggested-action.flat:backdrop:disabled > .label, button.suggested-action.sidebar-button:backdrop:disabled > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
+        button.suggested-action:backdrop:disabled > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
+        .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label, button.suggested-action.flat:backdrop:disabled > .label, button.suggested-action.sidebar-button:backdrop:disabled > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
         .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label {
           color: inherit; }
         button.suggested-action:backdrop:disabled:active, button.suggested-action:backdrop:disabled:checked, button.suggested-action.flat:backdrop:disabled:active, button.suggested-action.sidebar-button:backdrop:disabled:active, headerbar button.suggested-action.titlebutton:backdrop:disabled:active,
         .titlebar button.suggested-action.titlebutton:backdrop:disabled:active, button.suggested-action.flat:backdrop:disabled:checked, button.suggested-action.sidebar-button:backdrop:disabled:checked, headerbar button.suggested-action.titlebutton:backdrop:disabled:checked,
         .titlebar button.suggested-action.titlebutton:backdrop:disabled:checked {
-          color: #8db8e6;
-          border-color: #5093da;
-          background-image: linear-gradient(to bottom, #5093da);
+          color: #8db9e8;
+          border-color: #5094db;
+          background-image: linear-gradient(to bottom, #5094db);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-          button.suggested-action:backdrop:disabled:active > .label, button.suggested-action:backdrop:disabled:checked > .label, button.suggested-action.flat:backdrop:disabled:active > .label, button.suggested-action.sidebar-button:backdrop:disabled:active > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:active > .label,
+          button.suggested-action:backdrop:disabled:active > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:active > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:disabled:active > .label, button.suggested-action:backdrop:disabled:checked > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:checked > .label,
+          .titlebar button.suggested-action.titlebutton:backdrop:disabled:checked > .label, button.suggested-action.flat:backdrop:disabled:active > .label, button.suggested-action.sidebar-button:backdrop:disabled:active > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:active > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:disabled:active > .label, button.suggested-action.flat:backdrop:disabled:checked > .label, button.suggested-action.sidebar-button:backdrop:disabled:checked > .label, headerbar button.suggested-action.titlebutton:backdrop:disabled:checked > .label,
           .titlebar button.suggested-action.titlebutton:backdrop:disabled:checked > .label {
             color: inherit; }
@@ -733,20 +733,23 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       color: rgba(74, 144, 217, 0.8); }
     button.suggested-action:disabled {
-      color: #8b8e8e;
+      color: #8b8e8f;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #f1f1f0);
+      background-image: linear-gradient(to bottom, #f1f1f1);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.suggested-action:disabled > .label {
+      button.suggested-action:disabled > .label, headerbar button.suggested-action.titlebutton:disabled > .label,
+      .titlebar button.suggested-action.titlebutton:disabled > .label {
         color: inherit; }
       button.suggested-action:disabled:active, button.suggested-action:disabled:checked {
-        color: #b9d3f0;
+        color: #b9d4f1;
         border-color: #1c5187;
-        background-image: linear-gradient(to bottom, #4a8cd1, #5093da);
+        background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-        button.suggested-action:disabled:active > .label, button.suggested-action:disabled:checked > .label {
+        button.suggested-action:disabled:active > .label, headerbar button.suggested-action.titlebutton:disabled:active > .label,
+        .titlebar button.suggested-action.titlebutton:disabled:active > .label, button.suggested-action:disabled:checked > .label, headerbar button.suggested-action.titlebutton:disabled:checked > .label,
+        .titlebar button.suggested-action.titlebutton:disabled:checked > .label {
           color: inherit; }
     .osd button.suggested-action {
       color: #eeeeec;
@@ -776,9 +779,9 @@ button, headerbar button.titlebutton,
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.suggested-action:disabled, .osd button.suggested-action:backdrop:disabled {
-        color: #878989;
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -833,7 +836,7 @@ button, headerbar button.titlebutton,
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(255, 255, 255, 0); }
     button.destructive-action:backdrop, button.destructive-action.flat:backdrop, button.destructive-action.sidebar-button:backdrop, headerbar button.destructive-action.titlebutton:backdrop,
     .titlebar button.destructive-action.titlebutton:backdrop {
-      color: #fbd4d4;
+      color: #fcd4d4;
       border-color: #ef2929;
       background-image: linear-gradient(to bottom, #ef2929);
       text-shadow: none;
@@ -842,29 +845,32 @@ button, headerbar button.titlebutton,
       button.destructive-action:backdrop:active, button.destructive-action:backdrop:checked, button.destructive-action.flat:backdrop:active, button.destructive-action.sidebar-button:backdrop:active, headerbar button.destructive-action.titlebutton:backdrop:active,
       .titlebar button.destructive-action.titlebutton:backdrop:active, button.destructive-action.flat:backdrop:checked, button.destructive-action.sidebar-button:backdrop:checked, headerbar button.destructive-action.titlebutton:backdrop:checked,
       .titlebar button.destructive-action.titlebutton:backdrop:checked {
-        color: #f6cfcf;
+        color: #f7cfcf;
         border-color: #d51010;
         background-image: linear-gradient(to bottom, #d51010);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       button.destructive-action:backdrop:disabled, button.destructive-action.flat:backdrop:disabled, button.destructive-action.sidebar-button:backdrop:disabled, headerbar button.destructive-action.titlebutton:backdrop:disabled,
       .titlebar button.destructive-action.titlebutton:backdrop:disabled {
         color: #c3c3c0;
-        border-color: #a4a4a0;
-        background-image: linear-gradient(to bottom, #f1f1f0);
+        border-color: #a5a5a1;
+        background-image: linear-gradient(to bottom, #f1f1f1);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-        button.destructive-action:backdrop:disabled > .label, button.destructive-action.flat:backdrop:disabled > .label, button.destructive-action.sidebar-button:backdrop:disabled > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
+        button.destructive-action:backdrop:disabled > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
+        .titlebar button.destructive-action.titlebutton:backdrop:disabled > .label, button.destructive-action.flat:backdrop:disabled > .label, button.destructive-action.sidebar-button:backdrop:disabled > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
         .titlebar button.destructive-action.titlebutton:backdrop:disabled > .label {
           color: inherit; }
         button.destructive-action:backdrop:disabled:active, button.destructive-action:backdrop:disabled:checked, button.destructive-action.flat:backdrop:disabled:active, button.destructive-action.sidebar-button:backdrop:disabled:active, headerbar button.destructive-action.titlebutton:backdrop:disabled:active,
         .titlebar button.destructive-action.titlebutton:backdrop:disabled:active, button.destructive-action.flat:backdrop:disabled:checked, button.destructive-action.sidebar-button:backdrop:disabled:checked, headerbar button.destructive-action.titlebutton:backdrop:disabled:checked,
         .titlebar button.destructive-action.titlebutton:backdrop:disabled:checked {
-          color: #f47979;
+          color: #f57979;
           border-color: #ef3131;
           background-image: linear-gradient(to bottom, #ef3131);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-          button.destructive-action:backdrop:disabled:active > .label, button.destructive-action:backdrop:disabled:checked > .label, button.destructive-action.flat:backdrop:disabled:active > .label, button.destructive-action.sidebar-button:backdrop:disabled:active > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:active > .label,
+          button.destructive-action:backdrop:disabled:active > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:active > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:disabled:active > .label, button.destructive-action:backdrop:disabled:checked > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:checked > .label,
+          .titlebar button.destructive-action.titlebutton:backdrop:disabled:checked > .label, button.destructive-action.flat:backdrop:disabled:active > .label, button.destructive-action.sidebar-button:backdrop:disabled:active > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:active > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:disabled:active > .label, button.destructive-action.flat:backdrop:disabled:checked > .label, button.destructive-action.sidebar-button:backdrop:disabled:checked > .label, headerbar button.destructive-action.titlebutton:backdrop:disabled:checked > .label,
           .titlebar button.destructive-action.titlebutton:backdrop:disabled:checked > .label {
             color: inherit; }
@@ -880,20 +886,23 @@ button, headerbar button.titlebutton,
       -gtk-icon-shadow: none;
       color: rgba(239, 41, 41, 0.8); }
     button.destructive-action:disabled {
-      color: #8b8e8e;
+      color: #8b8e8f;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #f1f1f0);
+      background-image: linear-gradient(to bottom, #f1f1f1);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-      button.destructive-action:disabled > .label {
+      button.destructive-action:disabled > .label, headerbar button.destructive-action.titlebutton:disabled > .label,
+      .titlebar button.destructive-action.titlebutton:disabled > .label {
         color: inherit; }
       button.destructive-action:disabled:active, button.destructive-action:disabled:checked {
-        color: #f8acac;
+        color: #f9adad;
         border-color: #8e0b0b;
         background-image: linear-gradient(to bottom, #e52d2d, #ef3131);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-        button.destructive-action:disabled:active > .label, button.destructive-action:disabled:checked > .label {
+        button.destructive-action:disabled:active > .label, headerbar button.destructive-action.titlebutton:disabled:active > .label,
+        .titlebar button.destructive-action.titlebutton:disabled:active > .label, button.destructive-action:disabled:checked > .label, headerbar button.destructive-action.titlebutton:disabled:checked > .label,
+        .titlebar button.destructive-action.titlebutton:disabled:checked > .label {
           color: inherit; }
     .osd button.destructive-action {
       color: #eeeeec;
@@ -923,9 +932,9 @@ button, headerbar button.titlebutton,
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd button.destructive-action:disabled, .osd button.destructive-action:backdrop:disabled {
-        color: #878989;
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -959,10 +968,12 @@ button, headerbar button.titlebutton,
       padding-right: 6px;
       padding-top: 3px;
       padding-bottom: 3px; }
-    .stack-switcher > button.text-button {
+    .stack-switcher > button.text-button, headerbar .stack-switcher > button.text-button.titlebutton,
+    .titlebar .stack-switcher > button.text-button.titlebutton {
       padding-left: 10px;
       padding-right: 10px; }
-    .stack-switcher > button.image-button {
+    .stack-switcher > button.image-button, headerbar .stack-switcher > button.image-button.titlebutton,
+    .titlebar .stack-switcher > button.image-button.titlebutton {
       padding-left: 2px;
       padding-right: 2px; }
     .stack-switcher > button.needs-attention:active > label, .stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > button.needs-attention:checked > image {
@@ -989,7 +1000,7 @@ button, headerbar button.titlebutton,
   .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), stacksidebar row.needs-attention > label:dir(rtl) {
     background-position: left 3px, left 4px; }
 
-.inline-toolbar toolbutton > button,
+.inline-toolbar toolbutton > button, .inline-toolbar headerbar toolbutton > button.titlebutton,
 .inline-toolbar .titlebar toolbutton > button.titlebutton,
 .titlebar .inline-toolbar toolbutton > button.titlebutton {
   color: #2e3436;
@@ -999,7 +1010,8 @@ button, headerbar button.titlebutton,
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.8), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:hover {
+  .inline-toolbar toolbutton > button:hover, .inline-toolbar headerbar toolbutton > button.titlebutton:hover,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:hover {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #9d9d99;
@@ -1013,7 +1025,9 @@ button, headerbar button.titlebutton,
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px white, 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
+  .inline-toolbar toolbutton > button:active, .inline-toolbar headerbar toolbutton > button.titlebutton:active,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:active, .inline-toolbar toolbutton > button:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:checked,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:checked {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
     border-color: #9d9d99;
@@ -1021,47 +1035,56 @@ button, headerbar button.titlebutton,
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:disabled {
-    color: #8b8e8e;
+  .inline-toolbar toolbutton > button:disabled, .inline-toolbar headerbar toolbutton > button.titlebutton:disabled,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:disabled {
+    color: #8b8e8f;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f0);
+    background-image: linear-gradient(to bottom, #f1f1f1);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar toolbutton > button:disabled > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
-    color: #8b8e8e;
+  .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar headerbar toolbutton > button.titlebutton:disabled:active,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:disabled:active, .inline-toolbar toolbutton > button:disabled:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:disabled:checked,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:disabled:checked {
+    color: #8b8e8f;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #e8e8e7, #f1f1f0);
+    background-image: linear-gradient(to bottom, #e9e9e8, #f1f1f1);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar toolbutton > button:disabled:active > .label, .inline-toolbar toolbutton > button:disabled:checked > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:backdrop {
-    color: #8b8e8e;
-    border-color: #a4a4a0;
+  .inline-toolbar toolbutton > button:backdrop, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop {
+    color: #8b8e8f;
+    border-color: #a5a5a1;
     background-image: linear-gradient(to bottom, #e8e8e7);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
-    color: #8b8e8e;
-    border-color: #a4a4a0;
-    background-image: linear-gradient(to bottom, #d0d0ce);
+  .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:active,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:checked,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:checked {
+    color: #8b8e8f;
+    border-color: #a5a5a1;
+    background-image: linear-gradient(to bottom, #d1d1cf);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
-  .inline-toolbar toolbutton > button:backdrop:disabled {
+  .inline-toolbar toolbutton > button:backdrop:disabled, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:disabled,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:disabled {
     color: #c3c3c0;
-    border-color: #a4a4a0;
-    background-image: linear-gradient(to bottom, #f1f1f0);
+    border-color: #a5a5a1;
+    background-image: linear-gradient(to bottom, #f1f1f1);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar toolbutton > button:backdrop:disabled > .label {
       color: inherit; }
-  .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked {
+  .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:disabled:active,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked, .inline-toolbar headerbar toolbutton > button.titlebutton:backdrop:disabled:checked,
+  .inline-toolbar .titlebar toolbutton > button.titlebutton:backdrop:disabled:checked {
     color: #c3c3c0;
-    border-color: #a4a4a0;
-    background-image: linear-gradient(to bottom, #e5e5e3);
+    border-color: #a5a5a1;
+    background-image: linear-gradient(to bottom, #e4e4e4);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
     .inline-toolbar toolbutton > button:backdrop:disabled:active > .label, .inline-toolbar toolbutton > button:backdrop:disabled:checked > .label {
       color: inherit; }
@@ -1087,7 +1110,8 @@ headerbar .inline-toolbar toolbutton:backdrop > button.titlebutton,
   border-radius: 0;
   border-right-style: none; }
 
-.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked > button:first-child, headerbar .linked > button.titlebutton:first-child,
+.titlebar .linked > button.titlebutton:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, searchbar.inline-toolbar toolbutton:first-child > button.flat,
 .inline-toolbar.location-bar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:first-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:first-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:first-child > button.titlebutton, headerbar .inline-toolbar toolbutton:first-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:first-child > button.titlebutton,
@@ -1106,7 +1130,8 @@ headerbar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton,
 .titlebar .inline-toolbar toolbutton:backdrop:first-child > button.titlebutton, .linked > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
-.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked > button:last-child, headerbar .linked > button.titlebutton:last-child,
+.titlebar .linked > button.titlebutton:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, searchbar.inline-toolbar toolbutton:last-child > button.flat,
 .inline-toolbar.location-bar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:last-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:last-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:last-child > button.titlebutton, headerbar .inline-toolbar toolbutton:last-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:last-child > button.titlebutton,
@@ -1126,7 +1151,8 @@ headerbar .inline-toolbar toolbutton:backdrop:last-child > button.titlebutton,
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
-.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked > button:only-child, headerbar .linked > button.titlebutton:only-child,
+.titlebar .linked > button.titlebutton:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, searchbar.inline-toolbar toolbutton:only-child > button.flat,
 .inline-toolbar.location-bar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, searchbar.inline-toolbar toolbutton:only-child > button.sidebar-button,
 .inline-toolbar.location-bar toolbutton:only-child > button.sidebar-button, .inline-toolbar headerbar toolbutton:only-child > button.titlebutton, headerbar .inline-toolbar toolbutton:only-child > button.titlebutton,
 .inline-toolbar .titlebar toolbutton:only-child > button.titlebutton,
@@ -1146,18 +1172,22 @@ headerbar .inline-toolbar toolbutton:backdrop:only-child > button.titlebutton,
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > button.combo {
+.linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > button, headerbar .linked.vertical > button.titlebutton,
+.titlebar .linked.vertical > button.titlebutton, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop, .linked.vertical > combobox > button.combo {
   border-style: solid solid none solid;
   border-radius: 0; }
 
-.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > button.combo {
+.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, headerbar .linked.vertical > button.titlebutton:first-child,
+.titlebar .linked.vertical > button.titlebutton:first-child, .linked.vertical > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
-.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > button.combo {
+.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, headerbar .linked.vertical > button.titlebutton:last-child,
+.titlebar .linked.vertical > button.titlebutton:last-child, .linked.vertical > combobox:last-child > button.combo {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
-.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > button.combo {
+.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, headerbar .linked.vertical > button.titlebutton:only-child,
+.titlebar .linked.vertical > button.titlebutton:only-child, .linked.vertical > combobox:only-child > button.combo {
   border-radius: 3px;
   border-style: solid; }
 
@@ -1244,19 +1274,19 @@ headerbar button.titlebutton:visited,
     headerbar *:selected button.titlebutton:visited,
     *:selected .titlebar button.titlebutton:visited,
     .titlebar *:selected button.titlebutton:visited {
-      color: #b6d2ef; }
+      color: #b7d3f0; }
   *:link:hover, button:hover:link,
   button:hover:visited {
     color: #4a90d9; }
     *:selected *:link:hover, *:selected button:hover:link,
     *:selected button:hover:visited {
-      color: #ecf3fb; }
+      color: #edf4fb; }
   *:link:active, button:active:link,
   button:active:visited {
     color: #2a76c6; }
     *:selected *:link:active, *:selected button:active:link,
     *:selected button:active:visited {
-      color: #dae8f7; }
+      color: #dbe9f7; }
   *:link:backdrop, button:backdrop:link,
   button:backdrop:visited, *:link:backdrop:hover, button:backdrop:hover:link,
   button:backdrop:hover:visited, *:link:backdrop:hover:selected, button:backdrop:hover:selected:link,
@@ -1267,7 +1297,7 @@ headerbar button.titlebutton:visited,
   button:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:link,
   headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link,
   *:selected button:visited {
-    color: #dae8f7; }
+    color: #dbe9f7; }
 
 button:link, headerbar button.titlebutton:link,
 .titlebar button.titlebutton:link,
@@ -1280,9 +1310,10 @@ headerbar button.titlebutton:visited,
   button:visited:active,
   button:visited:checked {
     text-shadow: none; }
-  button:link > label,
+  button:link > label, headerbar button.titlebutton:link > label,
   .titlebar button.titlebutton:link > label,
   button:visited > label,
+  headerbar button.titlebutton:visited > label,
   .titlebar button.titlebutton:visited > label {
     text-decoration-line: underline; }
 
@@ -1295,7 +1326,7 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
   background-image: none;
   border-style: none none none solid;
   border-color: rgba(157, 157, 153, 0.3);
-  color: #42484a;
+  color: #43484a;
   border-radius: 0;
   box-shadow: none; }
   spinbutton:not(.vertical) button:dir(rtl) {
@@ -1304,13 +1335,13 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     color: #2e3436;
     background-color: rgba(46, 52, 54, 0.05); }
   spinbutton:not(.vertical) button:disabled {
-    color: rgba(139, 142, 142, 0.3); }
+    color: rgba(139, 142, 143, 0.3); }
   spinbutton:not(.vertical) button:active {
     box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
     background-color: rgba(0, 0, 0, 0.1); }
   spinbutton:not(.vertical) button:backdrop {
-    color: #969999;
-    border-color: rgba(164, 164, 160, 0.3);
+    color: #97999a;
+    border-color: rgba(165, 165, 161, 0.3);
     background-color: transparent; }
   spinbutton:not(.vertical) button:backdrop:disabled {
     background-image: none;
@@ -1363,7 +1394,7 @@ spinbutton:not(.vertical) .titlebar button.titlebutton,
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #878989;
+    color: #878a89;
     border-color: rgba(0, 0, 0, 0.5);
     -gtk-icon-shadow: none;
     box-shadow: none; }
@@ -1411,29 +1442,31 @@ spinbutton.vertical {
         -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
         box-shadow: inset 0 1px white; }
       spinbutton.vertical button:first-child:disabled {
-        color: #8b8e8e;
+        color: #8b8e8f;
         border-color: #9d9d99;
-        background-image: linear-gradient(to bottom, #f1f1f0);
+        background-image: linear-gradient(to bottom, #f1f1f1);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        spinbutton.vertical button:first-child:disabled > .label {
+        spinbutton.vertical button:first-child:disabled > .label, spinbutton.vertical headerbar button.titlebutton:first-child:disabled > .label,
+        spinbutton.vertical .titlebar button.titlebutton:first-child:disabled > .label {
           color: inherit; }
       spinbutton.vertical button:first-child:backdrop {
-        color: #8b8e8e;
-        border-color: #a4a4a0;
+        color: #8b8e8f;
+        border-color: #a5a5a1;
         background-image: linear-gradient(to bottom, #e8e8e7);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
         spinbutton.vertical button:first-child:backdrop:disabled {
           color: #c3c3c0;
-          border-color: #a4a4a0;
-          background-image: linear-gradient(to bottom, #f1f1f0);
+          border-color: #a5a5a1;
+          background-image: linear-gradient(to bottom, #f1f1f1);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-          spinbutton.vertical button:first-child:backdrop:disabled > .label {
+          spinbutton.vertical button:first-child:backdrop:disabled > .label, spinbutton.vertical headerbar button.titlebutton:first-child:backdrop:disabled > .label,
+          spinbutton.vertical .titlebar button.titlebutton:first-child:backdrop:disabled > .label {
             color: inherit; }
   spinbutton.vertical button:first-child, spinbutton.vertical button:first-child:active, spinbutton.vertical button:first-child:hover, spinbutton.vertical button:first-child:disabled, spinbutton.vertical button:first-child:backdrop {
     border-radius: 3px 3px 0 0;
@@ -1469,9 +1502,9 @@ spinbutton.vertical {
     -gtk-icon-shadow: none;
     outline-color: rgba(238, 238, 236, 0.3); }
   .osd spinbutton.vertical button:first-child:disabled {
-    color: #878989;
+    color: #878a89;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+    background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -1499,16 +1532,16 @@ treeview spinbutton spinbutton:focus {
 combobox {
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); }
-  combobox > button.combo,
+  combobox > button.combo, headerbar combobox > button.combo.titlebutton,
   .titlebar combobox > button.combo.titlebutton {
     padding-left: 8px;
     padding-right: 8px; }
   combobox:disabled {
-    color: #8b8e8e;
+    color: #8b8e8f;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
-    color: #8b8e8e;
+    color: #8b8e8f;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:disabled {
@@ -1525,11 +1558,13 @@ combobox {
   combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0; }
-  combobox > button.combo:not(:only-child):dir(ltr) {
+  combobox > button.combo:not(:only-child):dir(ltr), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(ltr),
+  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(ltr) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
     border-left-style: none; }
-  combobox > button.combo:not(:only-child):dir(rtl) {
+  combobox > button.combo:not(:only-child):dir(rtl), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(rtl),
+  .titlebar combobox > button.combo.titlebutton:not(:only-child):dir(rtl) {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
     border-right-style: none; }
@@ -1581,12 +1616,12 @@ searchbar,
 .location-bar {
   border-style: solid;
   border-color: #9d9d99;
-  background-color: #d1d1cf;
-  box-shadow: inset 0 2px 3px -1px #b1b1ae, 0 1px rgba(255, 255, 255, 0); }
+  background-color: #d2d2d0;
+  box-shadow: inset 0 2px 3px -1px #b2b2af, 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar:backdrop, searchbar:backdrop,
   .location-bar:backdrop {
-    border-color: #a4a4a0;
-    background-color: #d0d0ce;
+    border-color: #a5a5a1;
+    background-color: #d1d1cf;
     box-shadow: none; }
 
 /***************
@@ -1605,7 +1640,7 @@ headerbar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); }
   .titlebar:backdrop:not(headerbar),
   headerbar:backdrop {
-    border-color: #a4a4a0;
+    border-color: #a5a5a1;
     background-color: #e8e8e7;
     background-image: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); }
@@ -1625,11 +1660,11 @@ headerbar {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #184472;
     background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9);
-    box-shadow: inset 0 -1px #3875b4, inset 0 1px rgba(146, 188, 232, 0.9); }
+    box-shadow: inset 0 -1px #3975b5, inset 0 1px rgba(146, 188, 232, 0.9); }
     .selection-mode.titlebar:backdrop:not(headerbar),
     headerbar.selection-mode:backdrop {
       background-image: linear-gradient(to bottom, #4a90d9);
-      box-shadow: inset 0 1px rgba(164, 199, 236, 0.88); }
+      box-shadow: inset 0 1px rgba(165, 200, 236, 0.88); }
     .selection-mode.titlebar:not(headerbar) button,
     headerbar.selection-mode button,
     headerbar.selection-mode .titlebar button.titlebutton,
@@ -1683,7 +1718,7 @@ headerbar {
       headerbar.selection-mode button.flat:backdrop,
       headerbar.selection-mode button.sidebar-button:backdrop,
       headerbar.selection-mode button.titlebutton:backdrop {
-        color: #dae8f7;
+        color: #dbe9f7;
         border-color: #4a90d9;
         background-image: linear-gradient(to bottom, #4a90d9);
         text-shadow: none;
@@ -1702,7 +1737,7 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:checked,
         headerbar.selection-mode button.titlebutton:backdrop:checked {
-          color: #d4e3f3;
+          color: #d4e4f4;
           border-color: #2a76c6;
           background-image: linear-gradient(to bottom, #2a76c6);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0);
@@ -1713,19 +1748,21 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:disabled,
         headerbar.selection-mode button.sidebar-button:backdrop:disabled,
         headerbar.selection-mode button.titlebutton:backdrop:disabled {
-          color: #9ac1e9;
-          border-color: #65a0de;
-          background-image: linear-gradient(to bottom, #65a0de);
+          color: #9bc2ea;
+          border-color: #65a1df;
+          background-image: linear-gradient(to bottom, #65a1df);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0);
           border-color: #184472; }
-          .selection-mode.titlebar:not(headerbar) button:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled > .label,
+          .selection-mode.titlebar:not(headerbar) button:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled > .label,
           .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled > .label,
           headerbar.selection-mode button:backdrop:disabled > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled > .label,
           headerbar.selection-mode button.flat:backdrop:disabled > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:disabled > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:disabled > .label {
+          headerbar.selection-mode button.titlebutton:backdrop:disabled > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled > .label {
             color: inherit; }
         .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active,
         .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked,
@@ -1738,22 +1775,26 @@ headerbar {
         headerbar.selection-mode button.flat:backdrop:disabled:checked,
         headerbar.selection-mode button.sidebar-button:backdrop:disabled:checked,
         headerbar.selection-mode button.titlebutton:backdrop:disabled:checked {
-          color: #8db8e6;
-          border-color: #5093da;
-          background-image: linear-gradient(to bottom, #5093da);
+          color: #8db9e8;
+          border-color: #5094db;
+          background-image: linear-gradient(to bottom, #5094db);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0);
           border-color: #184472; }
-          .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active > .label,
-          .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked > .label,
+          .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled:active > .label,
+          .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:backdrop:disabled:checked > .label,
           .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop:disabled:checked > .label,
           headerbar.selection-mode button:backdrop:disabled:active > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:active > .label,
           headerbar.selection-mode button:backdrop:disabled:checked > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:checked > .label,
           headerbar.selection-mode button.flat:backdrop:disabled:active > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:disabled:active > .label,
           headerbar.selection-mode button.titlebutton:backdrop:disabled:active > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:active > .label,
           headerbar.selection-mode button.flat:backdrop:disabled:checked > .label,
           headerbar.selection-mode button.sidebar-button:backdrop:disabled:checked > .label,
-          headerbar.selection-mode button.titlebutton:backdrop:disabled:checked > .label {
+          headerbar.selection-mode button.titlebutton:backdrop:disabled:checked > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:backdrop:disabled:checked > .label {
             color: inherit; }
       .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.sidebar-button:backdrop,
       .selection-mode.titlebar:not(headerbar) button.titlebutton:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.sidebar-button:disabled,
@@ -1776,25 +1817,28 @@ headerbar {
         -gtk-icon-shadow: none; }
       .selection-mode.titlebar:not(headerbar) button:disabled,
       headerbar.selection-mode button:disabled {
-        color: #b2cfee;
+        color: #b2d0ef;
         border-color: #1c5187;
-        background-image: linear-gradient(to bottom, #65a0de);
+        background-image: linear-gradient(to bottom, #65a1df);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0); }
-        .selection-mode.titlebar:not(headerbar) button:disabled > .label,
-        headerbar.selection-mode button:disabled > .label {
+        .selection-mode.titlebar:not(headerbar) button:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:disabled > .label,
+        headerbar.selection-mode button:disabled > .label,
+        headerbar.selection-mode .titlebar button.titlebutton:disabled > .label {
           color: inherit; }
         .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked,
         headerbar.selection-mode button:disabled:active,
         headerbar.selection-mode button:disabled:checked {
-          color: #b9d3f0;
+          color: #b9d4f1;
           border-color: #1c5187;
-          background-image: linear-gradient(to bottom, #4a8cd1, #5093da);
+          background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0); }
-          .selection-mode.titlebar:not(headerbar) button:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button:disabled:checked > .label,
+          .selection-mode.titlebar:not(headerbar) button:disabled:active > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:disabled:active > .label, .selection-mode.titlebar:not(headerbar) button:disabled:checked > .label, .selection-mode.titlebar:not(headerbar) headerbar button.titlebutton:disabled:checked > .label,
           headerbar.selection-mode button:disabled:active > .label,
-          headerbar.selection-mode button:disabled:checked > .label {
+          headerbar.selection-mode .titlebar button.titlebutton:disabled:active > .label,
+          headerbar.selection-mode button:disabled:checked > .label,
+          headerbar.selection-mode .titlebar button.titlebutton:disabled:checked > .label {
             color: inherit; }
       .selection-mode.titlebar:not(headerbar) button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1834,20 +1878,21 @@ headerbar {
           border-color: #184472; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
-          color: #8b8e8e;
+          color: #8b8e8f;
           border-color: #9d9d99;
-          background-image: linear-gradient(to bottom, #f1f1f0);
+          background-image: linear-gradient(to bottom, #f1f1f1);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0);
           border-color: #184472; }
-          .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled > .label,
-          headerbar.selection-mode button.suggested-action:disabled > .label {
+          .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.suggested-action.titlebutton:disabled > .label,
+          headerbar.selection-mode button.suggested-action:disabled > .label,
+          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:disabled > .label {
             color: inherit; }
         .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop,
         headerbar.selection-mode button.suggested-action:backdrop {
-          color: #8b8e8e;
-          border-color: #a4a4a0;
+          color: #8b8e8f;
+          border-color: #a5a5a1;
           background-image: linear-gradient(to bottom, #e8e8e7);
           text-shadow: none;
           -gtk-icon-shadow: none;
@@ -1856,14 +1901,15 @@ headerbar {
         .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled,
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
           color: #c3c3c0;
-          border-color: #a4a4a0;
-          background-image: linear-gradient(to bottom, #f1f1f0);
+          border-color: #a5a5a1;
+          background-image: linear-gradient(to bottom, #f1f1f1);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(146, 188, 232, 0);
           border-color: #184472; }
-          .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled > .label,
-          headerbar.selection-mode button.suggested-action:backdrop:disabled > .label {
+          .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled > .label, .selection-mode.titlebar:not(headerbar) headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
+          headerbar.selection-mode button.suggested-action:backdrop:disabled > .label,
+          headerbar.selection-mode .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label {
             color: inherit; }
     .selection-mode.titlebar:not(headerbar) .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop,
     headerbar.selection-mode .selection-menu,
@@ -1966,15 +2012,15 @@ treeview.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #96999a;
+  border-left-color: #979a9b;
   border-top-color: #e8e8e7; }
-  treeview.view:selected {
+  treeview.view:selected, treeview.view:selected:focus {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: #a4c7ec;
+    border-left-color: #a5c8ec;
     border-top-color: rgba(46, 52, 54, 0.1); }
   treeview.view:disabled {
-    color: #8b8e8e; }
+    color: #8b8e8f; }
     treeview.view:disabled:selected {
       color: #92bce8; }
       treeview.view:disabled:selected:backdrop {
@@ -1986,29 +2032,29 @@ treeview.view {
     treeview.view.separator:backdrop {
       color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
-    border-left-color: #b9bbba;
+    border-left-color: #babbbb;
     border-top: #e8e8e7; }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #3c6287; }
+    border-color: #3c6288; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #6c7072; }
+    color: #6d7172; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
       color: #2e3436; }
     treeview.view.expander:selected {
-      color: #c8ddf3; }
+      color: #c9def4; }
       treeview.view.expander:selected:hover {
         color: #ffffff; }
       treeview.view.expander:selected:backdrop {
-        color: #c8ddf3; }
+        color: #c9def4; }
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #adafaf; }
+      color: #aeb0b1; }
   treeview.view.progressbar {
     color: #ffffff;
     border: 1px solid #184472;
@@ -2038,13 +2084,13 @@ treeview.view {
   treeview.view header button,
   treeview.view header .titlebar button.titlebutton,
   .titlebar treeview.view header button.titlebutton {
-    color: #96999a;
+    color: #979a9b;
     background-color: #ffffff;
     font-weight: bold;
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #626668;
+      color: #636769;
       box-shadow: none;
       transition: none; }
     treeview.view header button:active {
@@ -2073,7 +2119,7 @@ treeview.view header .titlebar button.titlebutton,
   treeview.view header button:backdrop {
     border-color: #e8e8e7;
     border-style: none solid solid none;
-    color: #b9bbba;
+    color: #babbbb;
     background-image: none;
     background-color: white; }
     treeview.view header button:backdrop:disabled {
@@ -2100,7 +2146,7 @@ menubar,
       color: #2a76c6; }
     menubar > menuitem:disabled,
     .menubar > menuitem:disabled {
-      color: #8b8e8e;
+      color: #8b8e8f;
       box-shadow: none; }
 
 menu,
@@ -2126,14 +2172,14 @@ menu,
       background-color: #4a90d9; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
-      color: #8b8e8e; }
+      color: #8b8e8f; }
       menu menuitem:disabled:backdrop,
       .menu menuitem:disabled:backdrop {
         color: #c3c3c0; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
-      color: #8b8e8e;
+      color: #8b8e8f;
       background-color: transparent; }
     menu menuitem arrow,
     .menu menuitem arrow {
@@ -2156,14 +2202,14 @@ menu,
     menu arrow.top,
     .menu arrow.top {
       -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
-      border-bottom: 1px solid #eaeaea; }
+      border-bottom: 1px solid #eaebeb; }
     menu arrow.bottom,
     .menu arrow.bottom {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-      border-top: 1px solid #eaeaea; }
+      border-top: 1px solid #eaebeb; }
     menu arrow:hover,
     .menu arrow:hover {
-      background-color: #eaeaea; }
+      background-color: #eaebeb; }
     menu arrow:disabled,
     .menu arrow:disabled {
       color: transparent;
@@ -2196,6 +2242,8 @@ popover.background {
     box-shadow: none; }
   popover.background > list,
   popover.background > .view,
+  textview popover.background > text,
+  popover.background > iconview,
   popover.background > toolbar,
   popover.background > .inline-toolbar,
   popover.background > searchbar,
@@ -2230,9 +2278,9 @@ notebook {
   notebook.frame {
     border: 1px solid #9d9d99; }
     notebook.frame:backdrop {
-      border-color: #a4a4a0; }
+      border-color: #a5a5a1; }
   notebook header {
-    background-color: #d1d1cf; }
+    background-color: #d2d2d0; }
     .frame notebook header {
       border: 1px solid #9d9d99; }
       .frame notebook header.top {
@@ -2244,11 +2292,11 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: #a4a4a0; }
+        border-color: #a5a5a1; }
     notebook header.top {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #9d9d99; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px #a4a4a0; }
+        box-shadow: inset 0 -1px #a5a5a1; }
       notebook header.top tab {
         padding: 8px 20px;
         border-bottom-width: 3px; }
@@ -2260,7 +2308,7 @@ notebook {
     notebook header.bottom {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #9d9d99; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px #a4a4a0; }
+        box-shadow: inset 0 1px #a5a5a1; }
       notebook header.bottom tab {
         padding: 8px 20px;
         border-top-width: 3px; }
@@ -2272,7 +2320,7 @@ notebook {
     notebook header.right {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #9d9d99; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 #a4a4a0; }
+        box-shadow: inset 1px 0 #a5a5a1; }
       notebook header.right tab {
         padding: 5px 20px;
         border-left-width: 3px; }
@@ -2282,7 +2330,7 @@ notebook {
     notebook header.left {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #9d9d99; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 #a4a4a0; }
+        box-shadow: inset -1px 0 #a5a5a1; }
       notebook header.left tab {
         padding: 5px 20px;
         border-right-width: 3px; }
@@ -2290,7 +2338,7 @@ notebook {
           border-bottom-width: 1px;
           border-top-width: 1px; }
     notebook header:backdrop {
-      background-color: #d0d0ce;
+      background-color: #d1d1cf;
       box-shadow: none; }
     notebook header.top tabs arrow.up, notebook header.bottom tabs arrow.up {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
@@ -2301,15 +2349,15 @@ notebook {
     notebook header.left tabs arrow.down, notebook header.right tabs arrow.down {
       -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
     notebook header tabs arrow {
-      color: #8b8e8e; }
+      color: #8b8e8f; }
       notebook header tabs arrow:hover {
-        color: #5c6162; }
+        color: #5d6163; }
       notebook header tabs arrow:active {
         color: #2e3436; }
       notebook header tabs arrow:disabled {
-        color: rgba(139, 142, 142, 0.3); }
+        color: rgba(139, 142, 143, 0.3); }
       notebook header tabs arrow:backdrop {
-        color: rgba(139, 142, 142, 0.4); }
+        color: rgba(139, 142, 143, 0.4); }
       notebook header tabs arrow:backdrop:disabled {
         color: #c3c3c0; }
   notebook tab {
@@ -2338,7 +2386,7 @@ notebook {
         .top notebook tab.reorderable-page:active:hover {
           background-color: rgba(232, 232, 231, 0.7); }
         .top notebook tab.reorderable-page:active:backdrop {
-          border-color: #a4a4a0;
+          border-color: #a5a5a1;
           background-color: #e8e8e7;
           border-bottom-color: #4a90d9; }
       .top notebook tab.reorderable-page:backdrop {
@@ -2357,7 +2405,7 @@ notebook {
         .bottom notebook tab.reorderable-page:active:hover {
           background-color: rgba(232, 232, 231, 0.7); }
         .bottom notebook tab.reorderable-page:active:backdrop {
-          border-color: #a4a4a0;
+          border-color: #a5a5a1;
           background-color: #e8e8e7;
           border-top-color: #4a90d9; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -2376,7 +2424,7 @@ notebook {
         .left notebook tab.reorderable-page:active:hover {
           background-color: rgba(232, 232, 231, 0.7); }
         .left notebook tab.reorderable-page:active:backdrop {
-          border-color: #a4a4a0;
+          border-color: #a5a5a1;
           background-color: #e8e8e7;
           border-right-color: #4a90d9; }
       .left notebook tab.reorderable-page:backdrop {
@@ -2395,7 +2443,7 @@ notebook {
         .right notebook tab.reorderable-page:active:hover {
           background-color: rgba(232, 232, 231, 0.7); }
         .right notebook tab.reorderable-page:active:backdrop {
-          border-color: #a4a4a0;
+          border-color: #a5a5a1;
           background-color: #e8e8e7;
           border-left-color: #4a90d9; }
       .right notebook tab.reorderable-page:backdrop {
@@ -2404,17 +2452,17 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: #8b8e8e; }
+      color: #8b8e8f; }
       notebook tab label:backdrop {
-        color: #a7a8a7; }
+        color: #a7a9a8; }
     notebook tab:hover label {
-      color: #5c6162; }
+      color: #5d6163; }
       notebook tab:hover label:backdrop {
-        color: #a7a8a7; }
+        color: #a7a9a8; }
     notebook tab:active label {
       color: #2e3436; }
       notebook tab:active label:backdrop {
-        color: #8b8e8e; }
+        color: #8b8e8f; }
     notebook tab button.flat, notebook tab button.sidebar-button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton,
     notebook tab .titlebar button.titlebutton,
     .titlebar notebook tab button.titlebutton {
@@ -2457,7 +2505,7 @@ notebook {
       notebook tab button.flat:backdrop, notebook tab button.sidebar-button:backdrop, notebook tab headerbar button.titlebutton:backdrop, headerbar notebook tab button.titlebutton:backdrop,
       notebook tab .titlebar button.titlebutton:backdrop,
       .titlebar notebook tab button.titlebutton:backdrop {
-        color: rgba(139, 142, 142, 0.3);
+        color: rgba(139, 142, 143, 0.3);
         border-color: transparent; }
 
 /**************
@@ -2499,15 +2547,15 @@ scrollbar trough {
   border: 1px none #9d9d99; }
   scrollbar trough:backdrop {
     background-color: #e1e1df;
-    border-color: #a4a4a0; }
+    border-color: #a5a5a1; }
 scrollbar slider {
-  background-color: #787c7c; }
+  background-color: #787c7d; }
   scrollbar slider:hover {
     background-color: #535859; }
   scrollbar slider:hover:active {
     background-color: #2a76c6; }
   scrollbar slider:backdrop {
-    background-color: #c2c4c3; }
+    background-color: #c3c4c4; }
   scrollbar slider:disabled {
     background-color: transparent; }
 scrollbar slider {
@@ -2548,7 +2596,7 @@ switch {
   border: 1px solid #9d9d99;
   border-radius: 3px;
   color: #2e3436;
-  background-image: linear-gradient(to bottom, #cacac7);
+  background-image: linear-gradient(to bottom, #cacac8);
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
   switch:active {
     color: white;
@@ -2558,16 +2606,16 @@ switch {
     box-shadow: 0 1px rgba(255, 255, 255, 0);
     text-shadow: 0 1px rgba(24, 68, 114, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); }
   switch:disabled {
-    color: #8b8e8e;
+    color: #8b8e8f;
     border-color: #9d9d99;
     background-image: none;
-    background-color: #f1f1f0;
+    background-color: #f1f1f1;
     box-shadow: 0 1px rgba(255, 255, 255, 0);
     text-shadow: none; }
   switch:backdrop {
-    color: #8b8e8e;
-    border-color: #a4a4a0;
-    background-image: linear-gradient(to bottom, #d0d0ce);
+    color: #8b8e8f;
+    border-color: #a5a5a1;
+    background-image: linear-gradient(to bottom, #d1d1cf);
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
@@ -2577,9 +2625,9 @@ switch {
       box-shadow: none; }
   switch:disabled {
     color: #c3c3c0;
-    border-color: #a4a4a0;
+    border-color: #a5a5a1;
     background-image: none;
-    background-color: #f1f1f0; }
+    background-color: #f1f1f1; }
   switch slider {
     margin: -1px;
     min-width: 45px;
@@ -2593,7 +2641,7 @@ switch {
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.8), 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 1px white, inset 0 -2px rgba(232, 232, 231, 0.6), inset 0 -1px #c2c2c0; }
+    box-shadow: inset 0 1px white, inset 0 -2px rgba(232, 232, 231, 0.6), inset 0 -1px #c3c3c0; }
   switch:hover slider {
     color: #2e3436;
     outline-color: rgba(46, 52, 54, 0.3);
@@ -2608,21 +2656,21 @@ switch {
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 1px white, 0 1px rgba(255, 255, 255, 0);
-    box-shadow: inset 0 1px white, inset 0 -2px rgba(232, 232, 231, 0.6), inset 0 -1px #c2c2c0; }
+    box-shadow: inset 0 1px white, inset 0 -2px rgba(232, 232, 231, 0.6), inset 0 -1px #c3c3c0; }
   switch:active slider {
     border: 1px solid #184472; }
   switch:disabled slider {
-    color: #8b8e8e;
+    color: #8b8e8f;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f0);
+    background-image: linear-gradient(to bottom, #f1f1f1);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     switch:disabled slider > .label {
       color: inherit; }
   switch:backdrop slider {
-    color: #8b8e8e;
-    border-color: #a4a4a0;
+    color: #8b8e8f;
+    border-color: #a5a5a1;
     background-image: linear-gradient(to bottom, #e8e8e7);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2632,8 +2680,8 @@ switch {
     border-color: #4a90d9; }
   switch:backdrop:disabled slider {
     color: #c3c3c0;
-    border-color: #a4a4a0;
-    background-image: linear-gradient(to bottom, #f1f1f0);
+    border-color: #a5a5a1;
+    background-image: linear-gradient(to bottom, #f1f1f1);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
@@ -2663,7 +2711,7 @@ check {
   .titlebar check button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:selected,
+.view check:selected, textview text check:selected, iconview check:selected,
 row:selected check {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked.png"), url("assets/selected-checkbox-unchecked@2.png")); }
 
@@ -2675,7 +2723,7 @@ check:hover {
   .titlebar check:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:hover:selected,
+.view check:hover:selected, textview text check:hover:selected, iconview check:hover:selected,
 row:selected check:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked-hover.png"), url("assets/selected-checkbox-unchecked-hover@2.png")); }
 
@@ -2687,7 +2735,7 @@ check:active {
   .titlebar check:active button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:active:selected,
+.view check:active:selected, textview text check:active:selected, iconview check:active:selected,
 row:selected check:active {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked-active.png"), url("assets/selected-checkbox-unchecked-active@2.png")); }
 
@@ -2699,7 +2747,7 @@ check:disabled {
   .titlebar check:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:disabled:selected,
+.view check:disabled:selected, textview text check:disabled:selected, iconview check:disabled:selected,
 row:selected check:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked-insensitive.png"), url("assets/selected-checkbox-unchecked-insensitive@2.png")); }
 
@@ -2711,7 +2759,7 @@ check:backdrop {
   .titlebar check:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:backdrop:selected,
+.view check:backdrop:selected, textview text check:backdrop:selected, iconview check:backdrop:selected,
 row:selected check:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked-backdrop.png"), url("assets/selected-checkbox-unchecked-backdrop@2.png")); }
 
@@ -2723,7 +2771,7 @@ check:backdrop:disabled {
   .titlebar check:backdrop:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:backdrop:disabled:selected,
+.view check:backdrop:disabled:selected, textview text check:backdrop:disabled:selected, iconview check:backdrop:disabled:selected,
 row:selected check:backdrop:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked-backdrop-insensitive.png"), url("assets/selected-checkbox-unchecked-backdrop-insensitive@2.png")); }
 
@@ -2735,7 +2783,7 @@ check:indeterminate {
   .titlebar check:indeterminate button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:indeterminate:selected,
+.view check:indeterminate:selected, textview text check:indeterminate:selected, iconview check:indeterminate:selected,
 row:selected check:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed.png"), url("assets/selected-checkbox-mixed@2.png")); }
 
@@ -2747,7 +2795,7 @@ check:indeterminate:hover {
   .titlebar check:indeterminate:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:indeterminate:hover:selected,
+.view check:indeterminate:hover:selected, textview text check:indeterminate:hover:selected, iconview check:indeterminate:hover:selected,
 row:selected check:indeterminate:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed-hover.png"), url("assets/selected-checkbox-mixed-hover@2.png")); }
 
@@ -2759,7 +2807,7 @@ check:indeterminate:selected {
   .titlebar check:indeterminate:selected button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:indeterminate:selected:selected,
+.view check:indeterminate:selected:selected, textview text check:indeterminate:selected:selected, iconview check:indeterminate:selected:selected,
 row:selected check:indeterminate:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed-active.png"), url("assets/selected-checkbox-mixed-active@2.png")); }
 
@@ -2771,7 +2819,7 @@ check:indeterminate:backdrop {
   .titlebar check:indeterminate:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:indeterminate:backdrop:selected,
+.view check:indeterminate:backdrop:selected, textview text check:indeterminate:backdrop:selected, iconview check:indeterminate:backdrop:selected,
 row:selected check:indeterminate:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed-backdrop.png"), url("assets/selected-checkbox-mixed-backdrop@2.png")); }
 
@@ -2783,7 +2831,7 @@ check:indeterminate:disabled {
   .titlebar check:indeterminate:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:indeterminate:disabled:selected,
+.view check:indeterminate:disabled:selected, textview text check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected,
 row:selected check:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed-insensitive.png"), url("assets/selected-checkbox-mixed-insensitive@2.png")); }
 
@@ -2795,7 +2843,7 @@ check:indeterminate:disabled:backdrop {
   .titlebar check:indeterminate:disabled:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:indeterminate:disabled:backdrop:selected,
+.view check:indeterminate:disabled:backdrop:selected, textview text check:indeterminate:disabled:backdrop:selected, iconview check:indeterminate:disabled:backdrop:selected,
 row:selected check:indeterminate:disabled:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed-backdrop-insensitive.png"), url("assets/selected-checkbox-mixed-backdrop-insensitive@2.png")); }
 
@@ -2807,7 +2855,7 @@ check:checked {
   .titlebar check:checked button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:checked:selected,
+.view check:checked:selected, textview text check:checked:selected, iconview check:checked:selected,
 row:selected check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked.png"), url("assets/selected-checkbox-checked@2.png")); }
 
@@ -2819,7 +2867,7 @@ check:checked:disabled {
   .titlebar check:checked:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:checked:disabled:selected,
+.view check:checked:disabled:selected, textview text check:checked:disabled:selected, iconview check:checked:disabled:selected,
 row:selected check:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-insensitive.png"), url("assets/selected-checkbox-checked-insensitive@2.png")); }
 
@@ -2831,7 +2879,7 @@ check:checked:hover {
   .titlebar check:checked:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:checked:hover:selected,
+.view check:checked:hover:selected, textview text check:checked:hover:selected, iconview check:checked:hover:selected,
 row:selected check:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-hover.png"), url("assets/selected-checkbox-checked-hover@2.png")); }
 
@@ -2843,7 +2891,7 @@ check:checked:active {
   .titlebar check:checked:active button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:checked:active:selected,
+.view check:checked:active:selected, textview text check:checked:active:selected, iconview check:checked:active:selected,
 row:selected check:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-active.png"), url("assets/selected-checkbox-checked-active@2.png")); }
 
@@ -2855,7 +2903,7 @@ check:backdrop:checked {
   .titlebar check:backdrop:checked button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:backdrop:checked:selected,
+.view check:backdrop:checked:selected, textview text check:backdrop:checked:selected, iconview check:backdrop:checked:selected,
 row:selected check:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-backdrop.png"), url("assets/selected-checkbox-checked-backdrop@2.png")); }
 
@@ -2867,12 +2915,12 @@ check:backdrop:checked:disabled {
   .titlebar check:backdrop:checked:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:backdrop:checked:disabled:selected,
+.view check:backdrop:checked:disabled:selected, textview text check:backdrop:checked:disabled:selected, iconview check:backdrop:checked:disabled:selected,
 row:selected check:backdrop:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-backdrop-insensitive.png"), url("assets/selected-checkbox-checked-backdrop-insensitive@2.png")); }
 
 menu menuitem check {
-  color: #656a6b;
+  color: #666a6b;
   -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
   -gtk-icon-shadow: none; }
   menu menuitem check:hover, menu menuitem check:disabled {
@@ -2887,7 +2935,7 @@ menu menuitem check {
   menu menuitem check:hover {
     color: #ffffff; }
   menu menuitem check:disabled {
-    color: #b9bbba; }
+    color: #babbbb; }
 
 radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png"));
@@ -2897,7 +2945,7 @@ radio {
   .titlebar radio button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:selected,
+.view radio:selected, textview text radio:selected, iconview radio:selected,
 row:selected radio {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked.png"), url("assets/selected-radio-unchecked@2.png")); }
 
@@ -2909,7 +2957,7 @@ radio:hover {
   .titlebar radio:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:hover:selected,
+.view radio:hover:selected, textview text radio:hover:selected, iconview radio:hover:selected,
 row:selected radio:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked-hover.png"), url("assets/selected-radio-unchecked-hover@2.png")); }
 
@@ -2921,7 +2969,7 @@ radio:active {
   .titlebar radio:active button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:active:selected,
+.view radio:active:selected, textview text radio:active:selected, iconview radio:active:selected,
 row:selected radio:active {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked-active.png"), url("assets/selected-radio-unchecked-active@2.png")); }
 
@@ -2933,7 +2981,7 @@ radio:disabled {
   .titlebar radio:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:disabled:selected,
+.view radio:disabled:selected, textview text radio:disabled:selected, iconview radio:disabled:selected,
 row:selected radio:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked-insensitive.png"), url("assets/selected-radio-unchecked-insensitive@2.png")); }
 
@@ -2945,7 +2993,7 @@ radio:backdrop {
   .titlebar radio:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:backdrop:selected,
+.view radio:backdrop:selected, textview text radio:backdrop:selected, iconview radio:backdrop:selected,
 row:selected radio:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked-backdrop.png"), url("assets/selected-radio-unchecked-backdrop@2.png")); }
 
@@ -2957,7 +3005,7 @@ radio:backdrop:disabled {
   .titlebar radio:backdrop:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:backdrop:disabled:selected,
+.view radio:backdrop:disabled:selected, textview text radio:backdrop:disabled:selected, iconview radio:backdrop:disabled:selected,
 row:selected radio:backdrop:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked-backdrop-insensitive.png"), url("assets/selected-radio-unchecked-backdrop-insensitive@2.png")); }
 
@@ -2969,7 +3017,7 @@ radio:indeterminate {
   .titlebar radio:indeterminate button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:indeterminate:selected,
+.view radio:indeterminate:selected, textview text radio:indeterminate:selected, iconview radio:indeterminate:selected,
 row:selected radio:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed.png"), url("assets/selected-radio-mixed@2.png")); }
 
@@ -2981,7 +3029,7 @@ radio:indeterminate:hover {
   .titlebar radio:indeterminate:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:indeterminate:hover:selected,
+.view radio:indeterminate:hover:selected, textview text radio:indeterminate:hover:selected, iconview radio:indeterminate:hover:selected,
 row:selected radio:indeterminate:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed-hover.png"), url("assets/selected-radio-mixed-hover@2.png")); }
 
@@ -2993,7 +3041,7 @@ radio:indeterminate:selected {
   .titlebar radio:indeterminate:selected button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:indeterminate:selected:selected,
+.view radio:indeterminate:selected:selected, textview text radio:indeterminate:selected:selected, iconview radio:indeterminate:selected:selected,
 row:selected radio:indeterminate:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed-active.png"), url("assets/selected-radio-mixed-active@2.png")); }
 
@@ -3005,7 +3053,7 @@ radio:indeterminate:backdrop {
   .titlebar radio:indeterminate:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:indeterminate:backdrop:selected,
+.view radio:indeterminate:backdrop:selected, textview text radio:indeterminate:backdrop:selected, iconview radio:indeterminate:backdrop:selected,
 row:selected radio:indeterminate:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed-backdrop.png"), url("assets/selected-radio-mixed-backdrop@2.png")); }
 
@@ -3017,7 +3065,7 @@ radio:indeterminate:disabled {
   .titlebar radio:indeterminate:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:indeterminate:disabled:selected,
+.view radio:indeterminate:disabled:selected, textview text radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected,
 row:selected radio:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed-insensitive.png"), url("assets/selected-radio-mixed-insensitive@2.png")); }
 
@@ -3029,7 +3077,7 @@ radio:indeterminate:disabled:backdrop {
   .titlebar radio:indeterminate:disabled:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:indeterminate:disabled:backdrop:selected,
+.view radio:indeterminate:disabled:backdrop:selected, textview text radio:indeterminate:disabled:backdrop:selected, iconview radio:indeterminate:disabled:backdrop:selected,
 row:selected radio:indeterminate:disabled:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed-backdrop-insensitive.png"), url("assets/selected-radio-mixed-backdrop-insensitive@2.png")); }
 
@@ -3041,7 +3089,7 @@ radio:checked {
   .titlebar radio:checked button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:checked:selected,
+.view radio:checked:selected, textview text radio:checked:selected, iconview radio:checked:selected,
 row:selected radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked.png"), url("assets/selected-radio-checked@2.png")); }
 
@@ -3053,7 +3101,7 @@ radio:checked:disabled {
   .titlebar radio:checked:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:checked:disabled:selected,
+.view radio:checked:disabled:selected, textview text radio:checked:disabled:selected, iconview radio:checked:disabled:selected,
 row:selected radio:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-insensitive.png"), url("assets/selected-radio-checked-insensitive@2.png")); }
 
@@ -3065,7 +3113,7 @@ radio:checked:hover {
   .titlebar radio:checked:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:checked:hover:selected,
+.view radio:checked:hover:selected, textview text radio:checked:hover:selected, iconview radio:checked:hover:selected,
 row:selected radio:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-hover.png"), url("assets/selected-radio-checked-hover@2.png")); }
 
@@ -3077,7 +3125,7 @@ radio:checked:active {
   .titlebar radio:checked:active button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:checked:active:selected,
+.view radio:checked:active:selected, textview text radio:checked:active:selected, iconview radio:checked:active:selected,
 row:selected radio:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-active.png"), url("assets/selected-radio-checked-active@2.png")); }
 
@@ -3089,7 +3137,7 @@ radio:backdrop:checked {
   .titlebar radio:backdrop:checked button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:backdrop:checked:selected,
+.view radio:backdrop:checked:selected, textview text radio:backdrop:checked:selected, iconview radio:backdrop:checked:selected,
 row:selected radio:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-backdrop.png"), url("assets/selected-radio-checked-backdrop@2.png")); }
 
@@ -3101,12 +3149,12 @@ radio:backdrop:checked:disabled {
   .titlebar radio:backdrop:checked:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:backdrop:checked:disabled:selected,
+.view radio:backdrop:checked:disabled:selected, textview text radio:backdrop:checked:disabled:selected, iconview radio:backdrop:checked:disabled:selected,
 row:selected radio:backdrop:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-backdrop-insensitive.png"), url("assets/selected-radio-checked-backdrop-insensitive@2.png")); }
 
 menu menuitem radio {
-  color: #656a6b;
+  color: #666a6b;
   -gtk-icon-source: -gtk-icontheme("radio-symbolic");
   -gtk-icon-shadow: none; }
   menu menuitem radio:hover, menu menuitem radio:disabled {
@@ -3121,52 +3169,52 @@ menu menuitem radio {
   menu menuitem radio:hover {
     color: #ffffff; }
   menu menuitem radio:disabled {
-    color: #b9bbba; }
+    color: #babbbb; }
 
-.view.check, .view.radio,
+.view.check, textview text.check, iconview.check, .view.radio, textview text.radio, iconview.radio,
 row .check, row .radio {
   -gtk-icon-shadow: none; }
-  .view.check:selected, .view.check:hover, .view.radio:selected, .view.radio:hover,
+  .view.check:selected, textview text.check:selected, iconview.check:selected, .view.check:hover, textview text.check:hover, iconview.check:hover, .view.radio:selected, textview text.radio:selected, iconview.radio:selected, .view.radio:hover, textview text.radio:hover, iconview.radio:hover,
   row .check:selected,
   row .check:hover, row .radio:selected, row .radio:hover {
     -gtk-icon-shadow: none; }
 
-.view.content-view.check:not(list) {
+.view.content-view.check:not(list), textview text.content-view.check:not(list), iconview.content-view.check:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:hover:not(list) {
+.view.content-view.check:hover:not(list), textview text.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-hover-selectionmode.png"), url("assets/checkbox-hover-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:active:not(list) {
+.view.content-view.check:active:not(list), textview text.content-view.check:active:not(list), iconview.content-view.check:active:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-active-selectionmode.png"), url("assets/checkbox-active-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:backdrop:not(list) {
+.view.content-view.check:backdrop:not(list), textview text.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-backdrop-selectionmode.png"), url("assets/checkbox-backdrop-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked:not(list) {
+.view.content-view.check:checked:not(list), textview text.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode.png"), url("assets/checkbox-checked-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked:hover:not(list) {
+.view.content-view.check:checked:hover:not(list), textview text.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-selectionmode.png"), url("assets/checkbox-checked-hover-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:checked:active:not(list) {
+.view.content-view.check:checked:active:not(list), textview text.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-selectionmode.png"), url("assets/checkbox-checked-active-selectionmode@2.png"));
   background-color: transparent; }
 
-.view.content-view.check:backdrop:checked:not(list) {
+.view.content-view.check:backdrop:checked:not(list), textview text.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list) {
   -gtk-icon-shadow: none;
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-selectionmode.png"), url("assets/checkbox-checked-backdrop-selectionmode@2.png"));
   background-color: transparent; }
@@ -3175,7 +3223,7 @@ checkbutton.text-button, radiobutton.text-button {
   padding: 1px 2px 4px;
   outline-offset: 0; }
   checkbutton.text-button:disabled, checkbutton.text-button:disabled:active, checkbutton.text-button:disabled:indeterminate, radiobutton.text-button:disabled, radiobutton.text-button:disabled:active, radiobutton.text-button:disabled:indeterminate {
-    color: #8b8e8e; }
+    color: #8b8e8f; }
     checkbutton.text-button:disabled:backdrop, checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop {
       color: #c3c3c0; }
 
@@ -3194,17 +3242,17 @@ checkbutton check {
 scale trough, scale fill, progressbar trough {
   border: 1px solid #9d9d99;
   border-radius: 3px;
-  background-color: #cdcdcb;
+  background-color: #cececc;
   box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(255, 255, 255, 0); }
   scale trough:disabled, scale fill:disabled, progressbar trough:disabled {
-    background-color: #f1f1f0;
+    background-color: #f1f1f1;
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   scale trough:backdrop, scale fill:backdrop, progressbar trough:backdrop, progressbar:backdrop trough {
-    background-color: #d0d0ce;
-    border-color: #a4a4a0;
+    background-color: #d1d1cf;
+    border-color: #a5a5a1;
     box-shadow: none; }
     scale trough:backdrop:disabled, scale fill:backdrop:disabled, progressbar trough:backdrop:disabled, progressbar:backdrop trough:disabled {
-      background-color: #f1f1f0; }
+      background-color: #f1f1f1; }
   row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough {
     box-shadow: none; }
     row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough, row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled {
@@ -3215,7 +3263,7 @@ scale trough, scale fill, progressbar trough {
     box-shadow: none;
     outline-color: rgba(238, 238, 236, 0.2); }
     .osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled {
-      background-color: rgba(52, 57, 57, 0.5); }
+      background-color: rgba(53, 57, 58, 0.5); }
 
 scale highlight, progressbar progress {
   border: 1px solid #184472;
@@ -3293,25 +3341,25 @@ scale {
     scale slider:active {
       border-color: #184472; }
     scale slider:disabled {
-      color: #8b8e8e;
+      color: #8b8e8f;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #f1f1f0);
+      background-image: linear-gradient(to bottom, #f1f1f1);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       scale slider:disabled > .label {
         color: inherit; }
     scale slider:backdrop {
-      color: #8b8e8e;
-      border-color: #a4a4a0;
+      color: #8b8e8f;
+      border-color: #a5a5a1;
       background-image: linear-gradient(to bottom, #e8e8e7);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
       scale slider:backdrop:disabled {
         color: #c3c3c0;
-        border-color: #a4a4a0;
-        background-image: linear-gradient(to bottom, #f1f1f0);
+        border-color: #a5a5a1;
+        background-image: linear-gradient(to bottom, #f1f1f1);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -3349,9 +3397,9 @@ scale {
         -gtk-icon-shadow: none;
         outline-color: rgba(238, 238, 236, 0.3); }
       .osd scale slider:disabled {
-        color: #878989;
+        color: #878a89;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -3645,15 +3693,15 @@ levelbar {
     padding: 2px;
     border-radius: 3px;
     background-color: #ffffff;
-    background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
+    background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
     color: black;
     border-color: #9d9d99;
     box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px rgba(255, 255, 255, 0); }
     levelbar trough:backdrop {
       background-color: #ffffff;
-      background-image: linear-gradient(to bottom, #d2d2d1, #fcfcfb 2px, #ffffff 90%);
-      color: #323232;
-      border-color: #a4a4a0;
+      background-image: linear-gradient(to bottom, #d3d3d1, #fcfcfc 2px, #ffffff 90%);
+      color: #333333;
+      border-color: #a5a5a1;
       background-image: linear-gradient(to bottom, white);
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   levelbar.horizontal.discrete block {
@@ -3690,7 +3738,7 @@ levelbar {
     border-color: rgba(46, 52, 54, 0.2);
     box-shadow: none; }
     levelbar block.empty:backdrop {
-      border-color: rgba(139, 142, 142, 0.15); }
+      border-color: rgba(139, 142, 143, 0.15); }
 
 /**********
  * Frames *
@@ -3707,14 +3755,14 @@ frame border,
     border-style: none; }
   frame border:backdrop,
   .frame:backdrop {
-    border-color: #a4a4a0; }
+    border-color: #a5a5a1; }
 
 paper {
   border: 1px solid #9d9d99;
   background: white;
   padding: 0; }
   paper:backdrop {
-    border-color: #a4a4a0; }
+    border-color: #a5a5a1; }
 
 actionbar box {
   padding: 6px;
@@ -3734,7 +3782,7 @@ scrolledwindow overshoot.top {
   box-shadow: none; }
   placessidebar overshoot.top:backdrop,
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#a4a4a0), to(rgba(164, 164, 160, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#a5a5a1), to(rgba(165, 165, 161, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -3752,7 +3800,7 @@ scrolledwindow overshoot.bottom {
   box-shadow: none; }
   placessidebar overshoot.bottom:backdrop,
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#a4a4a0), to(rgba(164, 164, 160, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#a5a5a1), to(rgba(165, 165, 161, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -3770,7 +3818,7 @@ scrolledwindow overshoot.left {
   box-shadow: none; }
   placessidebar overshoot.left:backdrop,
   scrolledwindow overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#a4a4a0), to(rgba(164, 164, 160, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#a5a5a1), to(rgba(165, 165, 161, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -3788,7 +3836,7 @@ scrolledwindow overshoot.right {
   box-shadow: none; }
   placessidebar overshoot.right:backdrop,
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#a4a4a0), to(rgba(164, 164, 160, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#a5a5a1), to(rgba(165, 165, 161, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -3849,7 +3897,7 @@ scrolledwindow junction {
     border-image-slice: 0 1 0 0; }
   placessidebar junction:backdrop,
   scrolledwindow junction:backdrop {
-    border-image-source: linear-gradient(to bottom, #a4a4a0 1px, transparent 1px);
+    border-image-source: linear-gradient(to bottom, #a5a5a1 1px, transparent 1px);
     background-color: #e1e1df; }
 
 separator {
@@ -3865,7 +3913,7 @@ list {
   border-color: #9d9d99; }
   list:backdrop {
     background-color: white;
-    border-color: #a4a4a0; }
+    border-color: #a5a5a1; }
   list row {
     padding: 2px; }
 
@@ -3878,7 +3926,7 @@ row.activatable:backdrop:hover {
 row.activatable:selected:active {
   box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
 row.activatable:selected.has-open-popup, row.activatable:selected:hover {
-  background-color: #4786c8; }
+  background-color: #4787c9; }
 row.activatable:selected:backdrop {
   background-color: #4a90d9; }
 
@@ -3930,8 +3978,8 @@ row:selected .titlebar button.titlebutton,
   row:selected button:backdrop, row:selected button.flat:backdrop, row:selected button.sidebar-button:backdrop, row:selected headerbar button.titlebutton:backdrop, headerbar row:selected button.titlebutton:backdrop,
   row:selected .titlebar button.titlebutton:backdrop,
   .titlebar row:selected button.titlebutton:backdrop {
-    color: #8b8e8e;
-    border-color: #a4a4a0;
+    color: #8b8e8f;
+    border-color: #a5a5a1;
     background-image: linear-gradient(to bottom, #e8e8e7);
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -3942,22 +3990,23 @@ row:selected .titlebar button.titlebutton,
     .titlebar row:selected button.titlebutton:backdrop:active, row:selected button.flat:backdrop:checked, row:selected button.sidebar-button:backdrop:checked, row:selected headerbar button.titlebutton:backdrop:checked, headerbar row:selected button.titlebutton:backdrop:checked,
     row:selected .titlebar button.titlebutton:backdrop:checked,
     .titlebar row:selected button.titlebutton:backdrop:checked {
-      color: #8b8e8e;
-      border-color: #a4a4a0;
-      background-image: linear-gradient(to bottom, #d0d0ce);
+      color: #8b8e8f;
+      border-color: #a5a5a1;
+      background-image: linear-gradient(to bottom, #d1d1cf);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
     row:selected button:backdrop:disabled, row:selected button.flat:backdrop:disabled, row:selected button.sidebar-button:backdrop:disabled, row:selected headerbar button.titlebutton:backdrop:disabled, headerbar row:selected button.titlebutton:backdrop:disabled,
     row:selected .titlebar button.titlebutton:backdrop:disabled,
     .titlebar row:selected button.titlebutton:backdrop:disabled {
       color: #c3c3c0;
-      border-color: #a4a4a0;
-      background-image: linear-gradient(to bottom, #f1f1f0);
+      border-color: #a5a5a1;
+      background-image: linear-gradient(to bottom, #f1f1f1);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #184472; }
-      row:selected button:backdrop:disabled > .label, row:selected button.flat:backdrop:disabled > .label, row:selected button.sidebar-button:backdrop:disabled > .label, row:selected headerbar button.titlebutton:backdrop:disabled > .label, headerbar row:selected button.titlebutton:backdrop:disabled > .label,
+      row:selected button:backdrop:disabled > .label, row:selected headerbar button.titlebutton:backdrop:disabled > .label,
+      row:selected .titlebar button.titlebutton:backdrop:disabled > .label, row:selected button.flat:backdrop:disabled > .label, row:selected button.sidebar-button:backdrop:disabled > .label, row:selected headerbar button.titlebutton:backdrop:disabled > .label, headerbar row:selected button.titlebutton:backdrop:disabled > .label,
       row:selected .titlebar button.titlebutton:backdrop:disabled > .label,
       .titlebar row:selected button.titlebutton:backdrop:disabled > .label {
         color: inherit; }
@@ -3967,11 +4016,13 @@ row:selected .titlebar button.titlebutton,
       row:selected .titlebar button.titlebutton:backdrop:disabled:checked,
       .titlebar row:selected button.titlebutton:backdrop:disabled:checked {
         color: #c3c3c0;
-        border-color: #a4a4a0;
-        background-image: linear-gradient(to bottom, #e5e5e3);
+        border-color: #a5a5a1;
+        background-image: linear-gradient(to bottom, #e4e4e4);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #184472; }
-        row:selected button:backdrop:disabled:active > .label, row:selected button:backdrop:disabled:checked > .label, row:selected button.flat:backdrop:disabled:active > .label, row:selected button.sidebar-button:backdrop:disabled:active > .label, row:selected headerbar button.titlebutton:backdrop:disabled:active > .label, headerbar row:selected button.titlebutton:backdrop:disabled:active > .label,
+        row:selected button:backdrop:disabled:active > .label, row:selected headerbar button.titlebutton:backdrop:disabled:active > .label,
+        row:selected .titlebar button.titlebutton:backdrop:disabled:active > .label, row:selected button:backdrop:disabled:checked > .label, row:selected headerbar button.titlebutton:backdrop:disabled:checked > .label,
+        row:selected .titlebar button.titlebutton:backdrop:disabled:checked > .label, row:selected button.flat:backdrop:disabled:active > .label, row:selected button.sidebar-button:backdrop:disabled:active > .label, row:selected headerbar button.titlebutton:backdrop:disabled:active > .label, headerbar row:selected button.titlebutton:backdrop:disabled:active > .label,
         row:selected .titlebar button.titlebutton:backdrop:disabled:active > .label,
         .titlebar row:selected button.titlebutton:backdrop:disabled:active > .label, row:selected button.flat:backdrop:disabled:checked > .label, row:selected button.sidebar-button:backdrop:disabled:checked > .label, row:selected headerbar button.titlebutton:backdrop:disabled:checked > .label, headerbar row:selected button.titlebutton:backdrop:disabled:checked > .label,
         row:selected .titlebar button.titlebutton:backdrop:disabled:checked > .label,
@@ -3988,21 +4039,24 @@ row:selected .titlebar button.titlebutton,
     -gtk-icon-shadow: none;
     color: white; }
   row:selected button:disabled {
-    color: #8b8e8e;
+    color: #8b8e8f;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f0);
+    background-image: linear-gradient(to bottom, #f1f1f1);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #184472; }
-    row:selected button:disabled > .label {
+    row:selected button:disabled > .label, row:selected headerbar button.titlebutton:disabled > .label,
+    row:selected .titlebar button.titlebutton:disabled > .label {
       color: inherit; }
     row:selected button:disabled:active, row:selected button:disabled:checked {
-      color: #8b8e8e;
+      color: #8b8e8f;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #e8e8e7, #f1f1f0);
+      background-image: linear-gradient(to bottom, #e9e9e8, #f1f1f1);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      row:selected button:disabled:active > .label, row:selected button:disabled:checked > .label {
+      row:selected button:disabled:active > .label, row:selected headerbar button.titlebutton:disabled:active > .label,
+      row:selected .titlebar button.titlebutton:disabled:active > .label, row:selected button:disabled:checked > .label, row:selected headerbar button.titlebutton:disabled:checked > .label,
+      row:selected .titlebar button.titlebutton:disabled:checked > .label {
         color: inherit; }
 
 row {
@@ -4059,17 +4113,17 @@ calendar {
     calendar.button:hover {
       color: #2e3436; }
     calendar.button:backdrop {
-      color: rgba(139, 142, 142, 0.45); }
+      color: rgba(139, 142, 143, 0.45); }
     calendar.button:disabled {
-      color: rgba(139, 142, 142, 0.45); }
+      color: rgba(139, 142, 143, 0.45); }
   calendar:indeterminate, calendar:indeterminate:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
     font-size: smaller;
     color: #2e3436; }
   calendar:backdrop {
-    color: #323232;
-    border-color: #a4a4a0; }
+    color: #333333;
+    border-color: #a5a5a1; }
 
 /***********
  * Dialogs *
@@ -4120,29 +4174,31 @@ messagedialog.csd .dialog-action-area button {
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
   messagedialog.csd .dialog-action-area button:disabled {
-    color: #8b8e8e;
+    color: #8b8e8f;
     border-color: #9d9d99;
-    background-image: linear-gradient(to bottom, #f1f1f0);
+    background-image: linear-gradient(to bottom, #f1f1f1);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:disabled > .label {
+    messagedialog.csd .dialog-action-area button:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.titlebutton:disabled > .label,
+    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:disabled > .label {
       color: inherit; }
   messagedialog.csd .dialog-action-area button:backdrop {
-    color: #8b8e8e;
-    border-color: #a4a4a0;
+    color: #8b8e8f;
+    border-color: #a5a5a1;
     background-image: linear-gradient(to bottom, #e8e8e7);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
   messagedialog.csd .dialog-action-area button:backdrop:disabled {
     color: #c3c3c0;
-    border-color: #a4a4a0;
-    background-image: linear-gradient(to bottom, #f1f1f0);
+    border-color: #a5a5a1;
+    background-image: linear-gradient(to bottom, #f1f1f1);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    messagedialog.csd .dialog-action-area button:backdrop:disabled > .label {
+    messagedialog.csd .dialog-action-area button:backdrop:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.titlebutton:backdrop:disabled > .label,
+    messagedialog.csd .dialog-action-area .titlebar button.titlebutton:backdrop:disabled > .label {
       color: inherit; }
   messagedialog.csd .dialog-action-area button.suggested-action {
     color: white;
@@ -4175,7 +4231,7 @@ messagedialog.csd .dialog-action-area button {
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
     messagedialog.csd .dialog-action-area button.suggested-action:backdrop {
-      color: #dae8f7;
+      color: #dbe9f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -4183,21 +4239,23 @@ messagedialog.csd .dialog-action-area button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled {
         color: #c3c3c0;
-        border-color: #a4a4a0;
-        background-image: linear-gradient(to bottom, #f1f1f0);
+        border-color: #a5a5a1;
+        background-image: linear-gradient(to bottom, #f1f1f1);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled > .label {
+        messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:backdrop:disabled > .label,
+        messagedialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:backdrop:disabled > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.suggested-action:disabled {
-      color: #8b8e8e;
+      color: #8b8e8f;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #f1f1f0);
+      background-image: linear-gradient(to bottom, #f1f1f1);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.suggested-action:disabled > .label {
+      messagedialog.csd .dialog-action-area button.suggested-action:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.suggested-action.titlebutton:disabled > .label,
+      messagedialog.csd .dialog-action-area .titlebar button.suggested-action.titlebutton:disabled > .label {
         color: inherit; }
   messagedialog.csd .dialog-action-area button.destructive-action {
     color: white;
@@ -4230,7 +4288,7 @@ messagedialog.csd .dialog-action-area button {
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
       box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); }
     messagedialog.csd .dialog-action-area button.destructive-action:backdrop {
-      color: #fbd4d4;
+      color: #fcd4d4;
       border-color: #ef2929;
       background-image: linear-gradient(to bottom, #ef2929);
       text-shadow: none;
@@ -4238,21 +4296,23 @@ messagedialog.csd .dialog-action-area button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled {
         color: #c3c3c0;
-        border-color: #a4a4a0;
-        background-image: linear-gradient(to bottom, #f1f1f0);
+        border-color: #a5a5a1;
+        background-image: linear-gradient(to bottom, #f1f1f1);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled > .label {
+        messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:backdrop:disabled > .label,
+        messagedialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:backdrop:disabled > .label {
           color: inherit; }
     messagedialog.csd .dialog-action-area button.destructive-action:disabled {
-      color: #8b8e8e;
+      color: #8b8e8f;
       border-color: #9d9d99;
-      background-image: linear-gradient(to bottom, #f1f1f0);
+      background-image: linear-gradient(to bottom, #f1f1f1);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      messagedialog.csd .dialog-action-area button.destructive-action:disabled > .label {
+      messagedialog.csd .dialog-action-area button.destructive-action:disabled > .label, messagedialog.csd .dialog-action-area headerbar button.destructive-action.titlebutton:disabled > .label,
+      messagedialog.csd .dialog-action-area .titlebar button.destructive-action.titlebutton:disabled > .label {
         color: inherit; }
 messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-area button:hover, messagedialog.csd .dialog-action-area button:active, messagedialog.csd .dialog-action-area button:disabled, messagedialog.csd .dialog-action-area button:backdrop, messagedialog.csd .dialog-action-area button:backdrop:disabled, messagedialog.csd .dialog-action-area button.suggested-action, messagedialog.csd .dialog-action-area button.suggested-action:hover, messagedialog.csd .dialog-action-area button.suggested-action:active, messagedialog.csd .dialog-action-area button.suggested-action:backdrop, messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled, messagedialog.csd .dialog-action-area button.suggested-action:disabled, messagedialog.csd .dialog-action-area button.destructive-action, messagedialog.csd .dialog-action-area button.destructive-action:hover, messagedialog.csd .dialog-action-area button.destructive-action:active, messagedialog.csd .dialog-action-area button.destructive-action:backdrop, messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled, messagedialog.csd .dialog-action-area button.destructive-action:disabled {
   border-left-style: solid;
@@ -4269,16 +4329,16 @@ messagedialog.csd .dialog-action-area button:first-child {
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #9d9d99; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #a4a4a0; }
+    border-top-color: #a5a5a1; }
 
 /***********
  * Sidebar *
  ***********/
 .sidebar {
   border: none;
-  background-color: #f3f3f3; }
+  background-color: #f4f4f3; }
   .sidebar:backdrop {
-    background-color: #f3f3f3; }
+    background-color: #f4f4f3; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -4310,7 +4370,9 @@ placessidebar row {
     padding: 5px;
     border-radius: 100%;
     -gtk-outline-radius: 100%; }
-    button.sidebar-button:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image {
+    button.sidebar-button:not(:hover):not(:active) > image, headerbar button.sidebar-button.titlebutton:not(:hover):not(:active) > image,
+    .titlebar button.sidebar-button.titlebutton:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image, headerbar button.sidebar-button.titlebutton:backdrop > image,
+    .titlebar button.sidebar-button.titlebutton:backdrop > image {
       opacity: 0.7; }
 placessidebar row:selected:active {
   box-shadow: none; }
@@ -4342,7 +4404,7 @@ paned > separator {
   paned > separator:selected {
     background-image: linear-gradient(to top, #4a90d9); }
   paned > separator:backdrop {
-    background-image: linear-gradient(to top, #a4a4a0); }
+    background-image: linear-gradient(to top, #a5a5a1); }
   paned > separator.wide {
     margin: 0;
     padding: 0;
@@ -4351,7 +4413,7 @@ paned > separator {
     background-image: linear-gradient(to top, #9d9d99), linear-gradient(to top, #9d9d99);
     background-size: 1px 1px, 1px 1px; }
     paned > separator.wide:backdrop {
-      background-image: linear-gradient(to top, #a4a4a0), linear-gradient(to top, #a4a4a0); }
+      background-image: linear-gradient(to top, #a5a5a1), linear-gradient(to top, #a5a5a1); }
 paned.horizontal > separator {
   background-repeat: repeat-y; }
   paned.horizontal > separator:dir(ltr) {
@@ -4448,22 +4510,29 @@ infobar {
     .question button:disabled,
     .warning button:disabled,
     .error button:disabled {
-      color: #b2cfee;
+      color: #b2d0ef;
       border-color: #1c5187;
-      background-image: linear-gradient(to bottom, #65a0de);
+      background-image: linear-gradient(to bottom, #65a1df);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info button:disabled > .label,
+      .info button:disabled > .label, .info headerbar button.titlebutton:disabled > .label,
+      .info .titlebar button.titlebutton:disabled > .label,
       .question button:disabled > .label,
+      .question headerbar button.titlebutton:disabled > .label,
+      .question .titlebar button.titlebutton:disabled > .label,
       .warning button:disabled > .label,
-      .error button:disabled > .label {
+      .warning headerbar button.titlebutton:disabled > .label,
+      .warning .titlebar button.titlebutton:disabled > .label,
+      .error button:disabled > .label,
+      .error headerbar button.titlebutton:disabled > .label,
+      .error .titlebar button.titlebutton:disabled > .label {
         color: inherit; }
     .info button:backdrop,
     .question button:backdrop,
     .warning button:backdrop,
     .error button:backdrop {
-      color: #dae8f7;
+      color: #dbe9f7;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
@@ -4474,17 +4543,24 @@ infobar {
       .question button:backdrop:disabled,
       .warning button:backdrop:disabled,
       .error button:backdrop:disabled {
-        color: #9ac1e9;
-        border-color: #65a0de;
-        background-image: linear-gradient(to bottom, #65a0de);
+        color: #9bc2ea;
+        border-color: #65a1df;
+        background-image: linear-gradient(to bottom, #65a1df);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #1c5187; }
-        .info button:backdrop:disabled > .label,
+        .info button:backdrop:disabled > .label, .info headerbar button.titlebutton:backdrop:disabled > .label,
+        .info .titlebar button.titlebutton:backdrop:disabled > .label,
         .question button:backdrop:disabled > .label,
+        .question headerbar button.titlebutton:backdrop:disabled > .label,
+        .question .titlebar button.titlebutton:backdrop:disabled > .label,
         .warning button:backdrop:disabled > .label,
-        .error button:backdrop:disabled > .label {
+        .warning headerbar button.titlebutton:backdrop:disabled > .label,
+        .warning .titlebar button.titlebutton:backdrop:disabled > .label,
+        .error button:backdrop:disabled > .label,
+        .error headerbar button.titlebutton:backdrop:disabled > .label,
+        .error .titlebar button.titlebutton:backdrop:disabled > .label {
           color: inherit; }
   .info label:selected, .info label:selected:focus, .info label:selected:hover,
   .question label:selected,
@@ -4558,7 +4634,7 @@ colorswatch.light overlay {
   colorswatch.light overlay:hover {
     border-color: rgba(0, 0, 0, 0.5); }
   colorswatch.light overlay:backdrop {
-    color: #323232; }
+    color: #333333; }
 colorswatch overlay {
   box-shadow: inset 0 2px 2px -3px rgba(0, 0, 0, 0.7);
   border: 1px solid rgba(0, 0, 0, 0.3); }
@@ -4594,8 +4670,8 @@ colorswatch#add-color-button {
       -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
       box-shadow: inset 0 1px white, 0 1px rgba(255, 255, 255, 0); }
     colorswatch#add-color-button overlay:backdrop {
-      color: #8b8e8e;
-      border-color: #a4a4a0;
+      color: #8b8e8f;
+      border-color: #a5a5a1;
       background-image: linear-gradient(to bottom, #e8e8e7);
       text-shadow: none;
       -gtk-icon-shadow: none;
@@ -4665,7 +4741,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #e8e8e7;
-    border: solid 1px #a4a4a0;
+    border: solid 1px #a5a5a1;
     box-shadow: none; }
 
 headerbar button.titlebutton,
@@ -4686,33 +4762,28 @@ headerbar.selection-mode button.titlebutton,
   .titlebar.selection-mode button.titlebutton:backdrop {
     -gtk-icon-shadow: none; }
 
-textview text selection,
-textview text selection:focus,
-.view selection,
-.view selection:focus, iconview:selected, iconview:selected:focus, flowbox flowboxchild:selected, label:selected,
+.view:selected, textview text:selected, iconview:selected, .view:selected:focus, textview text:selected:focus, iconview:selected:focus, textview text selection,
+textview text selection:focus, flowbox flowboxchild:selected, label:selected,
 label selection,
 label selection:focus,
 label selection:hover, entry selection, spinbutton selection,
 entry selection:focus,
 spinbutton selection:focus, modelbutton.flat:selected,
-.menuitem.button.flat:selected, treeview.view:selected, row:selected, calendar:selected, .sidebar :selected {
+.menuitem.button.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, calendar:selected, .sidebar :selected {
   background-color: #4a90d9;
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3); }
-  textview text selection:disabled,
-  .view selection:disabled, iconview:disabled:selected, flowbox flowboxchild:disabled:selected, label:disabled:selected,
+  .view:disabled:selected, textview text:disabled:selected, iconview:disabled:selected, textview text:disabled:selected:focus, iconview:disabled:selected:focus, textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled:selected,
   label selection:disabled, entry selection:disabled, spinbutton selection:disabled, modelbutton.flat:disabled:selected,
-  .menuitem.button.flat:disabled:selected, treeview.view:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label {
-    color: #a4c7ec; }
-  textview text selection:backdrop,
-  .view selection:backdrop, iconview:backdrop:selected, flowbox flowboxchild:backdrop:selected, label:backdrop:selected,
+  .menuitem.button.flat:disabled:selected, treeview.view:disabled:selected:focus, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label {
+    color: #a5c8ec; }
+  .view:backdrop:selected, textview text:backdrop:selected, iconview:backdrop:selected, textview text:backdrop:selected:focus, iconview:backdrop:selected:focus, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label:backdrop:selected,
   label selection:backdrop, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected,
-  .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, .sidebar :backdrop:selected {
+  .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected:focus, row:backdrop:selected, calendar:backdrop:selected, .sidebar :backdrop:selected {
     color: #ffffff; }
-    textview text selection:backdrop:disabled,
-    .view selection:backdrop:disabled, iconview:backdrop:disabled:selected, flowbox flowboxchild:backdrop:disabled:selected, label:backdrop:disabled:selected,
+    .view:backdrop:disabled:selected, textview text:backdrop:disabled:selected, iconview:backdrop:disabled:selected, textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, label:backdrop:disabled:selected,
     label selection:backdrop:disabled, entry selection:backdrop:disabled, spinbutton selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected,
-    .menuitem.button.flat:backdrop:disabled:selected, treeview.view:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected, placessidebar row:selected:disabled label:backdrop, placessidebar row:selected:backdrop:disabled label {
+    .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected, placessidebar row:selected:disabled label:backdrop, placessidebar row:selected:backdrop:disabled label {
       color: #80b1e4; }
 
 .monospace {
@@ -4768,12 +4839,12 @@ button.circular, headerbar button.circular.titlebutton,
   padding-bottom: 3px;
   padding-left: 6px;
   padding-right: 6px;
-  color: #8b8e8e;
+  color: #8b8e8f;
   background-color: #ffffff;
   border: 1px solid;
-  border-color: #c2c2c0;
+  border-color: #c3c3c0;
   border-radius: 5px;
-  box-shadow: inset 0 -3px #ececeb;
+  box-shadow: inset 0 -3px #ededec;
   font-size: smaller; }
   .keycap:backdrop {
     background-color: white;
@@ -4821,16 +4892,16 @@ text/foreground color of selections */
 @define-color theme_selected_fg_color #ffffff;
 /*
 base background color of insensitive widgets */
-@define-color insensitive_bg_color #f1f1f0;
+@define-color insensitive_bg_color #f1f1f1;
 /*
 text foreground color of insensitive widgets */
-@define-color insensitive_fg_color #8b8e8e;
+@define-color insensitive_fg_color #8b8e8f;
 /*
 insensitive text widgets and the like base background color */
 @define-color insensitive_base_color #ffffff;
 /*
 widget text/foreground color on backdrop windows */
-@define-color theme_unfocused_fg_color #8b8e8e;
+@define-color theme_unfocused_fg_color #8b8e8f;
 /*
 text color for entries, views and content in general on backdrop windows */
 @define-color theme_unfocused_text_color black;
@@ -4851,7 +4922,7 @@ widgets main borders color */
 @define-color borders #9d9d99;
 /*
 widgets main borders color on backdrop windows */
-@define-color unfocused_borders #a4a4a0;
+@define-color unfocused_borders #a5a5a1;
 /*
 these are pretty self explicative */
 @define-color warning_color #f57900;
@@ -4861,7 +4932,7 @@ these are pretty self explicative */
 these colors are exported for the window manager and shouldn't be used in applications,
 read if you used those and something break with a version upgrade you're on your own... */
 @define-color wm_title shade(#2e3436, 1.8);
-@define-color wm_unfocused_title #8b8e8e;
+@define-color wm_unfocused_title #8b8e8f;
 @define-color wm_highlight rgba(255, 255, 255, 0.8);
 @define-color wm_borders_edge rgba(255, 255, 255, 0.8);
 @define-color wm_bg_a shade(#e8e8e7, 1.2);